eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support '.<digits>' floating literals in Double.parseDouble

Browse Source 
See #327
This commit is contained in:
Alexey Andreev 2018-02-16 23:17:17 +03:00
parent 0485930c1f
commit 52a23fcadd
4 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classlib/src/main/java/org/teavm/classlib/java/lang/TDouble.java
View File

@ -83,11 +83,13 @@ public class TDouble extends TNumber implements TComparable<TDouble> {
++index; ++index;
} }
char c = string.charAt(index); char c = string.charAt(index);
long mantissa = 0;
int exp = 0;
if (c != '.') {
if (c < '0' || c > '9') { if (c < '0' || c > '9') {
throw new TNumberFormatException(); throw new TNumberFormatException();
} }
long mantissa = 0;
int exp = 0;
while (string.charAt(index) == '0') { while (string.charAt(index) == '0') {
if (++index == string.length()) { if (++index == string.length()) {
return 0; return 0;
@ -105,6 +107,7 @@ public class TDouble extends TNumber implements TComparable<TDouble> {
} }
++index; ++index;
} }
}
if (index < string.length() && string.charAt(index) == '.') { if (index < string.length() && string.charAt(index) == '.') {
++index; ++index;
boolean hasOneDigit = false; boolean hasOneDigit = false;

9
classlib/src/main/java/org/teavm/classlib/java/lang/TFloat.java
View File

@ -117,11 +117,14 @@ public class TFloat extends TNumber implements TComparable<TFloat> {
++index; ++index;
} }
char c = string.charAt(index); char c = string.charAt(index);
int mantissa = 0;
int exp = 0;
if (c != '.') {
if (c < '0' || c > '9') { if (c < '0' || c > '9') {
throw new TNumberFormatException(); throw new TNumberFormatException();
} }
int mantissa = 0;
int exp = 0;
while (string.charAt(index) == '0') { while (string.charAt(index) == '0') {
if (++index == string.length()) { if (++index == string.length()) {
return 0; return 0;
@ -139,6 +142,8 @@ public class TFloat extends TNumber implements TComparable<TFloat> {
} }
++index; ++index;
} }
}
if (index < string.length() && string.charAt(index) == '.') { if (index < string.length() && string.charAt(index) == '.') {
++index; ++index;
boolean hasOneDigit = false; boolean hasOneDigit = false;

1
tests/src/test/java/org/teavm/classlib/java/lang/DoubleTest.java
View File

@ -34,6 +34,7 @@ public class DoubleTest {
assertEquals(23, Double.parseDouble("00230000e-4"), 1E-12); assertEquals(23, Double.parseDouble("00230000e-4"), 1E-12);
assertEquals(23, Double.parseDouble("2300000000000000000000e-20"), 1E-12); assertEquals(23, Double.parseDouble("2300000000000000000000e-20"), 1E-12);
assertEquals(23, Double.parseDouble("2300000000000000000000e-20"), 1E-12); assertEquals(23, Double.parseDouble("2300000000000000000000e-20"), 1E-12);
assertEquals(0.1, Double.parseDouble(".1"), 0.001);
} }
@Test @Test

30
tests/src/test/java/org/teavm/classlib/java/lang/FloatTest.java
View File

@ -25,28 +25,30 @@ import org.teavm.junit.TeaVMTestRunner;
public class FloatTest { public class FloatTest {
@Test @Test
public void parsed() { public void parsed() {
assertEquals(23, Double.parseDouble("23"), 1E-12); assertEquals(23, Float.parseFloat("23"), 1E-12F);
assertEquals(23, Double.parseDouble("23.0"), 1E-12); assertEquals(23, Float.parseFloat("23.0"), 1E-12F);
assertEquals(23, Double.parseDouble("23E0"), 1E-12); assertEquals(23, Float.parseFloat("23E0"), 1E-12F);
assertEquals(23, Double.parseDouble("2.30000E1"), 1E-12); assertEquals(23, Float.parseFloat("2.30000E1"), 1E-12F);
assertEquals(23, Double.parseDouble("0.23E2"), 1E-12); assertEquals(23, Float.parseFloat("0.23E2"), 1E-12F);
assertEquals(23, Double.parseDouble("0.000023E6"), 1E-12); assertEquals(23, Float.parseFloat("0.000023E6"), 1E-12F);
assertEquals(23, Double.parseDouble("00230000e-4"), 1E-12); assertEquals(23, Float.parseFloat("00230000e-4"), 1E-12F);
assertEquals(23, Double.parseDouble("2300000000000000000000e-20"), 1E-12); assertEquals(23, Float.parseFloat("2300000000000000000000e-20"), 1E-12F);
assertEquals(23, Double.parseDouble("2300000000000000000000e-20"), 1E-12); assertEquals(23, Float.parseFloat("2300000000000000000000e-20"), 1E-12F);
assertEquals(23, Float.parseFloat("2300000000000000000000e-20"), 1E-12F);
assertEquals(0.1F, Float.parseFloat("0.1"), 0.001F);
} }
@Test @Test
public void negativeParsed() { public void negativeParsed() {
assertEquals(-23, Double.parseDouble("-23"), 1E-12); assertEquals(-23, Float.parseFloat("-23"), 1E-12F);
} }
@Test @Test
public void zeroParsed() { public void zeroParsed() {
assertEquals(0, Double.parseDouble("0.0"), 1E-12); assertEquals(0, Float.parseFloat("0.0"), 1E-12F);
assertEquals(0, Double.parseDouble("23E-8000"), 1E-12); assertEquals(0, Float.parseFloat("23E-8000"), 1E-12F);
assertEquals(0, Double.parseDouble("00000"), 1E-12); assertEquals(0, Float.parseFloat("00000"), 1E-12F);
assertEquals(0, Double.parseDouble("00000.0000"), 1E-12); assertEquals(0, Float.parseFloat("00000.0000"), 1E-12F);
} }
@Test @Test