#76 fix E at the end of double

Author: taowen

src/main/java/com/jsoniter/IterImpl.java

@@ -415,30 +415,32 @@ static final long readPositiveLong(final JsonIterator iter, byte c) throws IOExc
     static final double readPositiveDouble(final JsonIterator iter) throws IOException {
         int oldHead = iter.head;
         try {
-            long value = IterImplNumber.readLong(iter); // without the dot
-            if (iter.head == iter.tail) {
-                return value;
-            }
-            byte c = iter.buf[iter.head];
-            if (c == '.') {
-                iter.head++;
-                int start = iter.head;
-                c = iter.buf[iter.head++];
-                long decimalPart = readPositiveLong(iter, c);
-                int decimalPlaces = iter.head - start;
-                if (decimalPlaces > 0 && decimalPlaces < IterImplNumber.POW10.length && (iter.head - oldHead) < 10) {
-                    value = value * IterImplNumber.POW10[decimalPlaces] + decimalPart;
-                    return value / (double) IterImplNumber.POW10[decimalPlaces];
+            try {
+                long value = IterImplNumber.readLong(iter); // without the dot
+                if (iter.head == iter.tail) {
+                    return value;
+                }
+                byte c = iter.buf[iter.head];
+                if (c == '.') {
+                    iter.head++;
+                    int start = iter.head;
+                    c = iter.buf[iter.head++];
+                    long decimalPart = readPositiveLong(iter, c);
+                    int decimalPlaces = iter.head - start;
+                    if (decimalPlaces > 0 && decimalPlaces < IterImplNumber.POW10.length && (iter.head - oldHead) < 10) {
+                        value = value * IterImplNumber.POW10[decimalPlaces] + decimalPart;
+                        return value / (double) IterImplNumber.POW10[decimalPlaces];
+                    } else {
+                        iter.head = oldHead;
+                        return IterImplForStreaming.readDoubleSlowPath(iter);
+                    }
                 } else {
-                    iter.head = oldHead;
-                    return IterImplForStreaming.readDoubleSlowPath(iter);
+                    return value;
                 }
-            } else {
-                if (iter.head < iter.tail && iter.buf[iter.head] == 'e') {
+            } finally {
+                if (iter.head < iter.tail && (iter.buf[iter.head] == 'e' || iter.buf[iter.head] == 'E')) {
                     iter.head = oldHead;
                     return IterImplForStreaming.readDoubleSlowPath(iter);
-                } else {
-                    return value;
                 }
             }
         } catch (JsonException e) {

src/main/java/com/jsoniter/IterImplForStreaming.java

@@ -524,7 +524,8 @@ static int readIntSlowPath(JsonIterator iter, int value) throws IOException {
 
     public static final double readDoubleSlowPath(final JsonIterator iter) throws IOException {
         try {
-            return Double.valueOf(readNumber(iter));
+            String numberAsStr = readNumber(iter);
+            return Double.valueOf(numberAsStr);
         } catch (NumberFormatException e) {
             throw iter.reportError("readDoubleSlowPath", e.toString());
         }

src/test/java/com/jsoniter/TestFloat.java

@@ -44,6 +44,11 @@ public void test_decimal_places() throws IOException {
         assertEquals(720368.54775807d, parseDouble("720368.547758075,"), 0.01f);
     }
 
+    public void test_combination_of_dot_and_exponent() throws IOException {
+        double v = JsonIterator.parse("8.37377E9").readFloat();
+        assertEquals(Double.valueOf("8.37377E9"), v, 1000d);
+    }
+
     @Category(StreamingCategory.class)
     public void test_streaming() throws IOException {
         isStreaming = true;