simplify code

taowen · taowen · commit 1073c848fa7e · 2017-01-04T08:47:03.000+08:00
diff --git a/demo/src/test/java/com/jsoniter/demo/ModelTest.java b/demo/src/test/java/com/jsoniter/demo/ModelTest.java
@@ -32,7 +32,7 @@ public class ModelTest {
 
     @Setup(Level.Trial)
     public void benchSetup(BenchmarkParams params) {
-        JsonIterator.enableStreamingSupport();
+//        JsonIterator.enableStreamingSupport();
         input = "{\"name\":\"wenshao\",\"id\":1001}";
         inputBytes = input.getBytes();
         iter = new JsonIterator();
diff --git a/src/main/java/com/jsoniter/IterImpl.java b/src/main/java/com/jsoniter/IterImpl.java
@@ -7,30 +7,23 @@
 class IterImpl {
 
     public static final int readObjectFieldAsHash(JsonIterator iter) throws IOException {
-        if (IterImpl.nextToken(iter) != '"') {
+        if (nextToken(iter) != '"') {
             throw iter.reportError("readObjectFieldAsHash", "expect \"");
         }
         long hash = 0x811c9dc5;
-        for (; ; ) {
-            byte c = 0;
-            int i = iter.head;
-            for (; i < iter.tail; i++) {
-                c = iter.buf[i];
-                if (c == '"') {
-                    break;
-                }
-                hash ^= c;
-                hash *= 0x1000193;
-            }
+        for (int i = iter.head; i < iter.tail; i++) {
+            byte c = iter.buf[i];
             if (c == '"') {
                 iter.head = i + 1;
-                if (IterImpl.nextToken(iter) != ':') {
+                if (nextToken(iter) != ':') {
                     throw iter.reportError("readObjectFieldAsHash", "expect :");
                 }
                 return (int) hash;
             }
-            throw iter.reportError("readObjectFieldAsHash", "unmatched quote");
+            hash ^= c;
+            hash *= 0x1000193;
         }
+        throw iter.reportError("readObjectFieldAsHash", "unmatched quote");
     }
 
     public static final Slice readObjectFieldAsSlice(JsonIterator iter) throws IOException {
@@ -76,7 +69,7 @@ final static void skipObject(JsonIterator iter) throws IOException {
             switch (iter.buf[i]) {
                 case '"': // If inside string, skip it
                     iter.head = i + 1;
-                    IterImpl.skipString(iter);
+                    skipString(iter);
                     i = iter.head - 1; // it will be i++ soon
                     break;
                 case '{': // If open symbol, increase level
@@ -190,7 +183,7 @@ public static Any readAny(JsonIterator iter) throws IOException {
                 return Any.wrap(false);
             case 'n':
                 skipUntilBreak(iter);
-                return Any.wrap((Object)null);
+                return Any.wrap((Object) null);
             case '[':
                 skipArray(iter);
                 return Any.lazyArray(iter.buf, start, iter.head);
