Plexus-Mirror/toml4j
1
0
Fork 0
mirror of https://github.com/plexusorg/toml4j.git synced 2024-12-29 11:42:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed exponent handling

Browse source
This commit is contained in:
moandji.ezana 2015-01-22 15:05:47 +02:00
parent ba84494583
commit be3b027d1e
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
## NEXT
* Fixed short-form Unicode escapes
* Fixed exponent handling
## 0.3.1 / 2014-12-16
* Support for [TOML 0.3.1](https://github.com/toml-lang/toml/tree/v0.3.1) spec

2
src/main/java/com/moandjiezana/toml/ExponentConverter.java
View file

@ -16,6 +16,6 @@ class ExponentConverter implements ValueConverter {
public Object convert(String s) {
String[] exponentString = ((String) parse(parser().Exponent(), s).get(0)).split("[eE]");
return Math.pow(Double.parseDouble(exponentString[0]), Double.parseDouble(exponentString[1]));
return Double.parseDouble(exponentString[0]) * Math.pow(10, Double.parseDouble(exponentString[1]));
}
}

16
src/test/java/com/moandjiezana/toml/NumberTest.java
View file

@ -51,12 +51,16 @@ public class NumberTest {
public void should_get_exponent() throws Exception {
Toml toml = new Toml().parse("lower_case = 1e6\nupper_case = 2E6\nwith_plus = 5e+22\nboth_plus = +5E+22\nnegative = -2E-2\nfractional = 6.626e-34");
assertEquals(Math.pow(1, 6), toml.getDouble("lower_case"), 0.0);
assertEquals(Math.pow(2, 6), toml.getDouble("upper_case"), 0.0);
assertEquals(Math.pow(5, 22), toml.getDouble("with_plus"), 0.0);
assertEquals(Math.pow(5, 22), toml.getDouble("both_plus"), 0.0);
assertEquals(Math.pow(-2, -2), toml.getDouble("negative"), 0.0);
assertEquals(Math.pow(6.626D, -34), toml.getDouble("fractional"), 0.0);
assertEquals(1e6, toml.getDouble("lower_case"), 0.0);
assertEquals(2E6, toml.getDouble("upper_case"), 0.0);
assertEquals(5e22, toml.getDouble("with_plus"), 0.0);
assertEquals(5e22, toml.getDouble("both_plus"), 0.0);
assertEquals(-2e-2, toml.getDouble("negative"), 0.0);
assertEquals(6.626D * Math.pow(10, -34), toml.getDouble("fractional"), 0.0);
}
public static void main(String[] args) {
System.out.println(1e6);
}
@Test(expected = IllegalStateException.class)