optimize read true/false/null

taowen · taowen · commit a2e87ca160e4 · 2017-01-17T10:38:39.000+08:00
diff --git a/src/main/java/com/jsoniter/JsonIterator.java b/src/main/java/com/jsoniter/JsonIterator.java
@@ -141,26 +141,25 @@ public final String currentBuffer() {
 
     public final boolean readNull() throws IOException {
         byte c = IterImpl.nextToken(this);
-        if (c == 'n') {
-            IterImpl.skipUntilBreak(this);
-            return true;
+        if (c != 'n') {
+            unreadByte();
+            return false;
         }
-        unreadByte();
-        return false;
+        IterImpl.skipFixedBytes(this, 3); // null
+        return true;
     }
 
     public final boolean readBoolean() throws IOException {
         byte c = IterImpl.nextToken(this);
-        switch (c) {
-            case 't':
-                IterImpl.skipFixedBytes(this, 3); // true
-                return true;
-            case 'f':
-                IterImpl.skipFixedBytes(this, 4); // false
-                return false;
-            default:
-                throw reportError("readBoolean", "expect t or f, found: " + c);
+        if ('t' == c) {
+            IterImpl.skipFixedBytes(this, 3); // true
+            return true;
+        }
+        if ('f' == c) {
+            IterImpl.skipFixedBytes(this, 4); // false
+            return false;
         }
+        throw reportError("readBoolean", "expect t or f, found: " + c);
     }
 
     public final short readShort() throws IOException {
diff --git a/src/test/java/com/jsoniter/TestBoolean.java b/src/test/java/com/jsoniter/TestBoolean.java
@@ -7,13 +7,22 @@
 
 public class TestBoolean extends TestCase {
     @org.junit.experimental.categories.Category(StreamingCategory.class)
-    public void test() throws IOException {
-        JsonIterator iter = JsonIterator.parse(new ByteArrayInputStream("[true,false,true]".getBytes()), 4);
+    public void test_streaming() throws IOException {
+        JsonIterator iter = JsonIterator.parse(new ByteArrayInputStream("[true,false,null,true]".getBytes()), 3);
         iter.readArray();
         assertTrue(iter.readBoolean());
         iter.readArray();
         assertFalse(iter.readBoolean());
         iter.readArray();
+        assertTrue(iter.readNull());
+        iter.readArray();
         assertTrue(iter.readBoolean());
     }
+
+    public void test_non_streaming() throws IOException {
+        assertTrue(JsonIterator.parse("true").readBoolean());
+        assertFalse(JsonIterator.parse("false").readBoolean());
+        assertTrue(JsonIterator.parse("null").readNull());
+        assertFalse(JsonIterator.parse("false").readNull());
+    }
 }
