LongLazyAny for streaming

taowen · taowen · commit b045cbae85a3 · 2017-01-04T20:23:24.000+08:00
diff --git a/src/main/java/com/jsoniter/IterImplForStreaming.java b/src/main/java/com/jsoniter/IterImplForStreaming.java
@@ -171,6 +171,28 @@ final static void skipUntilBreak(JsonIterator iter) throws IOException {
         }
     }
 
+    final static boolean skipNumber(JsonIterator iter) throws IOException {
+        // true, false, null, number
+        boolean dotFound = false;
+        for (; ; ) {
+            for (int i = iter.head; i < iter.tail; i++) {
+                byte c = iter.buf[i];
+                if (c == '.') {
+                    dotFound = true;
+                    continue;
+                }
+                if (IterImplSkip.breaks[c]) {
+                    iter.head = i;
+                    return dotFound;
+                }
+            }
+            if (!loadMore(iter)) {
+                iter.head = iter.tail;
+                return dotFound;
+            }
+        }
+    }
+
     // read the bytes between " "
     final static Slice readSlice(JsonIterator iter) throws IOException {
         int end = IterImplString.findSliceEnd(iter);
@@ -287,10 +309,10 @@ final static byte readByte(JsonIterator iter) throws IOException {
     public static Any readAny(JsonIterator iter) throws IOException {
         // TODO: avoid small memory allocation
         iter.skipStartedAt = iter.head;
-        byte c = IterImpl.nextToken(iter);
+        byte c = nextToken(iter);
         switch (c) {
             case '"':
-                IterImpl.skipString(iter);
+                skipString(iter);
                 byte[] copied = copySkippedBytes(iter);
                 return Any.lazyString(copied, 0, copied.length);
             case '-':
@@ -304,27 +326,31 @@ public static Any readAny(JsonIterator iter) throws IOException {
             case '7':
             case '8':
             case '9':
-                IterImpl.skipUntilBreak(iter);
-                copied = copySkippedBytes(iter);
-                return Any.lazyDouble(copied, 0, copied.length);
+                if (skipNumber(iter)) {
+                    copied = copySkippedBytes(iter);
+                    return Any.lazyDouble(copied, 0, copied.length);
+                } else {
+                    copied = copySkippedBytes(iter);
+                    return Any.lazyLong(copied, 0, copied.length);
+                }
             case 't':
-                IterImpl.skipUntilBreak(iter);
+                skipUntilBreak(iter);
                 iter.skipStartedAt = -1;
                 return Any.wrap(true);
             case 'f':
-                IterImpl.skipUntilBreak(iter);
+                skipUntilBreak(iter);
                 iter.skipStartedAt = -1;
                 return Any.wrap(false);
             case 'n':
-                IterImpl.skipUntilBreak(iter);
+                skipUntilBreak(iter);
                 iter.skipStartedAt = -1;
                 return Any.wrap((Object)null);
             case '[':
-                IterImpl.skipArray(iter);
+                skipArray(iter);
                 copied = copySkippedBytes(iter);
                 return Any.lazyArray(copied, 0, copied.length);
             case '{':
-                IterImpl.skipObject(iter);
+                skipObject(iter);
                 copied = copySkippedBytes(iter);
                 return Any.lazyObject(copied, 0, copied.length);
             default:
diff --git a/src/test/java/com/jsoniter/TestReadAny.java b/src/test/java/com/jsoniter/TestReadAny.java
@@ -13,6 +13,10 @@
 
 public class TestReadAny extends TestCase {
 
+    static {
+//        JsonIterator.enableStreamingSupport();
+    }
+
     public void test_read_any() throws IOException {
         JsonIterator iter = JsonIterator.parse("[0,1,2,3]");
         assertEquals(3, iter.readAny().toInt(3));
