fix leading zero

Author: taowen

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

@@ -325,6 +325,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) {
+ IterImplForStreaming.assertNotLeadingZero(iter);
+ return 0;
+ }
  if (ind == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
  throw iter.reportError("readPositiveInt", "expect 0~9");
  }
@@ -335,9 +339,6 @@ static final int readPositiveInt(final JsonIterator iter, byte c) throws IOExcep
  iter.head = i;
  return ind;
  }
- if (ind == 0) {
- throw iter.reportError("readPositiveInt", "leading zero is invalid for int");
- }
  int ind3 = IterImplNumber.intDigits[iter.buf[++i]];
  if (ind3 == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
  iter.head = i;
@@ -380,6 +381,10 @@ 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) {
+ IterImplForStreaming.assertNotLeadingZero(iter);
+ return 0;
+ }
  if (ind == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
  throw iter.reportError("readPositiveLong", "expect 0~9");
  }
@@ -390,9 +395,6 @@ static final long readPositiveLong(final JsonIterator iter, byte c) throws IOExc
  iter.head = i;
  return ind;
  }
- if (ind == 0) {
- throw iter.reportError("readPositiveLong", "leading zero is invalid for long");
- }
  int ind3 = IterImplNumber.intDigits[iter.buf[++i]];
  if (ind3 == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
  iter.head = i;

src/main/java/com/jsoniter/IterImplForStreaming.java

@@ -591,6 +591,7 @@ static final double readPositiveDouble(final JsonIterator iter) throws IOExcepti
  static final long readPositiveLong(final JsonIterator iter, byte c) throws IOException {
  long ind = IterImplNumber.intDigits[c];
  if (ind == 0) {
+ assertNotLeadingZero(iter);
  return 0;
  }
  if (ind == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
@@ -602,11 +603,27 @@ static final long readPositiveLong(final JsonIterator iter, byte c) throws IOExc
  static final int readPositiveInt(final JsonIterator iter, byte c) throws IOException {
  int ind = IterImplNumber.intDigits[c];
  if (ind == 0) {
+ assertNotLeadingZero(iter);
  return 0;
  }
  if (ind == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
  throw iter.reportError("readPositiveInt", "expect 0~9");
  }
  return IterImplForStreaming.readIntSlowPath(iter, ind);
  }
+
+ static void assertNotLeadingZero(JsonIterator iter) throws IOException {
+ try {
+ byte nextByte = IterImpl.readByte(iter);
+ iter.unreadByte();
+ int ind2 = IterImplNumber.intDigits[nextByte];
+ if (ind2 == IterImplNumber.INVALID_CHAR_FOR_NUMBER) {
+ return;
+ }
+ throw iter.reportError("readPositiveInt", "leading zero is invalid");
+ } catch (ArrayIndexOutOfBoundsException e) {
+ iter.head = iter.tail;
+ return;
+ }
+ }
 }

src/test/java/com/jsoniter/TestInteger.java

@@ -93,6 +93,8 @@ public void test_streaming() throws IOException {
  }
 
  public void test_leading_zero() throws IOException {
+ assertEquals(Integer.valueOf(0), JsonIterator.deserialize("0", int.class));
+ assertEquals(Long.valueOf(0), JsonIterator.deserialize("0", long.class));
  try {
  JsonIterator.deserialize("01", int.class);
  fail();