optimize

taowen · taowen · commit 85b2923dda1d · 2017-01-11T19:56:06.000+08:00
diff --git a/src/main/java/com/jsoniter/IterImpl.java b/src/main/java/com/jsoniter/IterImpl.java
@@ -216,4 +216,8 @@ public static Any readAny(JsonIterator iter) throws IOException {
                 throw iter.reportError("IterImplSkip", "do not know how to skip: " + c);
         }
     }
+
+    public static void skipFixedBytes(JsonIterator iter, int n) throws IOException {
+        iter.head += n;
+    }
 }
diff --git a/src/main/java/com/jsoniter/IterImplForStreaming.java b/src/main/java/com/jsoniter/IterImplForStreaming.java
@@ -366,4 +366,15 @@ private static byte[] copySkippedBytes(JsonIterator iter) {
         System.arraycopy(iter.buf, start, bytes, 0, bytes.length);
         return bytes;
     }
+
+    public static void skipFixedBytes(JsonIterator iter, int n) throws IOException {
+        iter.head += n;
+        if (iter.head >= iter.tail) {
+            int more = iter.head - iter.tail;
+            if (!loadMore(iter)) {
+                throw iter.reportError("skipFixedBytes", "unexpected end");
+            }
+            iter.head += more;
+        }
+    }
 }
diff --git a/src/main/java/com/jsoniter/JsonIterator.java b/src/main/java/com/jsoniter/JsonIterator.java
@@ -152,10 +152,10 @@ public final boolean readBoolean() throws IOException {
         byte c = IterImpl.nextToken(this);
         switch (c) {
             case 't':
-                IterImpl.skipUntilBreak(this);
+                IterImpl.skipFixedBytes(this, 3); // true
                 return true;
             case 'f':
-                IterImpl.skipUntilBreak(this);
+                IterImpl.skipFixedBytes(this, 4); // false
                 return false;
             default:
                 throw reportError("readBoolean", "expect t or f, found: " + c);
diff --git a/src/main/java/com/jsoniter/output/JsonStream.java b/src/main/java/com/jsoniter/output/JsonStream.java
@@ -59,15 +59,15 @@ public final void write(int b1, int b2, int b3) throws IOException {
     }
 
     public final void write(byte b[], int off, int len) throws IOException {
-        if (len >= buf.length) {
+        if (len >= buf.length - count) {
+            if (len >= buf.length) {
             /* If the request length exceeds the size of the output buffer,
                flush the output buffer and then write the data directly.
                In this way buffered streams will cascade harmlessly. */
-            flushBuffer();
-            out.write(b, off, len);
-            return;
-        }
-        if (len > buf.length - count) {
+                flushBuffer();
+                out.write(b, off, len);
+                return;
+            }
             flushBuffer();
         }
         System.arraycopy(b, off, buf, count, len);
diff --git a/src/test/java/com/jsoniter/TestBoolean.java b/src/test/java/com/jsoniter/TestBoolean.java
@@ -0,0 +1,20 @@
+package com.jsoniter;
+
+import junit.framework.TestCase;
+import org.junit.experimental.categories.Category;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+public class TestBoolean extends TestCase {
+    @Category(AllTests.StreamingCategory.class)
+    public void test() throws IOException {
+        JsonIterator iter = JsonIterator.parse(new ByteArrayInputStream("[true,false,true]".getBytes()), 4);
+        iter.readArray();
+        assertTrue(iter.readBoolean());
+        iter.readArray();
+        assertFalse(iter.readBoolean());
+        iter.readArray();
+        assertTrue(iter.readBoolean());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -216,4 +216,8 @@ public static Any readAny(JsonIterator iter) throws IOException {`
`216`	`216`	`throw iter.reportError("IterImplSkip", "do not know how to skip: " + c);`
`217`	`217`	`}`
`218`	`218`	`}`
	`219`	`+`
	`220`	`+ public static void skipFixedBytes(JsonIterator iter, int n) throws IOException {`
	`221`	`+ iter.head += n;`
	`222`	`+ }`
`219`	`223`	`}`