#115 better leading zero detection

Author: taowen

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

@@ -308,10 +308,10 @@ public static int updateStringCopyBound(final JsonIterator iter, final int bound
     static final int readPositiveInt(final JsonIterator iter, byte c) throws IOException {
         int ind = IterImplNumber.intDigits[c];
         if (ind == 0) {
-            return 0;
+            throw iter.reportError("readPositiveInt", "leading zero is invalid for int");
         }
         if (ind == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
-            throw iter.reportError("readPositiveInt", "expect 0~9");
+            throw iter.reportError("readPositiveInt", "expect 1~9");
         }
         if (iter.tail - iter.head > 9) {
             int i = iter.head;
@@ -362,8 +362,11 @@ static final int readPositiveInt(final JsonIterator iter, byte c) throws IOExcep
 
     static final long readPositiveLong(final JsonIterator iter, byte c) throws IOException {
         long ind = IterImplNumber.intDigits[c];
+        if (ind == 0) {
+            throw iter.reportError("readPositiveLong", "leading zero is invalid for long");
+        }
         if (ind == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
-            throw iter.reportError("readPositiveLong", "expect 0~9");
+            throw iter.reportError("readPositiveLong", "expect 1~9");
         }
         if (iter.tail - iter.head > 9) {
             int i = iter.head;

src/main/java/com/jsoniter/IterImplNumber.java

@@ -87,8 +87,6 @@ public static final int readInt(final JsonIterator iter) throws IOException {
         byte c = IterImpl.nextToken(iter);
         if (c == '-') {
             return -IterImpl.readPositiveInt(iter, IterImpl.readByte(iter));
-        } else if (c == '0') {
-            throw new JsonException("leading zero is invalid number");
         } else {
             return IterImpl.readPositiveInt(iter, c);
         }
@@ -98,8 +96,6 @@ public static final long readLong(JsonIterator iter) throws IOException {
         byte c = IterImpl.nextToken(iter);
         if (c == '-') {
             return -IterImpl.readPositiveLong(iter, IterImpl.readByte(iter));
-        } else if (c == '0') {
-            throw new JsonException("leading zero is invalid number");
         } else {
             return IterImpl.readPositiveLong(iter, c);
         }