Revert "Fixes #1173: column/offset locations wrong for many error conditions" (#1214)

cowtowncoder · web-flow · commit 5c9909015023 · 2024-02-11T19:06:16.000-08:00
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -409,4 +409,4 @@ Mario Fusco (@mariofusco)
 Paul Bunyan (@hal7df)
  * Reported #1173: `JsonLocation` consistently off by one character for many invalid
    JSON parsing cases
-  (2.16.2)
+  (2.17.0)
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -16,9 +16,7 @@ a pure JSON library.
 
 2.16.2 (not yet released)
 
-#1173: `JsonLocation` consistently off by one character for many invalid JSON
-  parsing cases
- (reported by Paul B)
+-
 
 2.16.1 (24-Dec-2023)
 
diff --git a/src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java b/src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
@@ -769,7 +769,6 @@ public final JsonToken nextToken() throws IOException
         case '}':
             // Error: } is not valid at this point; valid closers have
             // been handled earlier
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(i, "expected a value");
         case 't':
             _matchTrue();
@@ -1456,7 +1455,6 @@ private final JsonToken _parseFloat(int ch, int startPtr, int ptr, boolean neg,
             // must be followed by sequence of ints, one minimum
             if (fractLen == 0) {
                 if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {
-                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedNumberChar(ch, "Decimal point not followed by a digit");
                 }
             }
@@ -1486,7 +1484,6 @@ private final JsonToken _parseFloat(int ch, int startPtr, int ptr, boolean neg,
             }
             // must be followed by sequence of ints, one minimum
             if (expLen == 0) {
-                --_inputPtr; // for correct error reporting
                 _reportUnexpectedNumberChar(ch, "Exponent indicator not followed by a digit");
             }
         }
@@ -1647,7 +1644,6 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
             // must be followed by sequence of ints, one minimum
             if (fractLen == 0) {
                 if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {
-                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");
                 }
             }
@@ -1692,7 +1688,6 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept
             }
             // must be followed by sequence of ints, one minimum
             if (expLen == 0) {
-                --_inputPtr; // for correct error reporting
                 _reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");
             }
         }
@@ -1793,13 +1788,11 @@ protected JsonToken _handleInvalidNumberStart(int ch, final boolean negative, fi
             }
         }
         if (!isEnabled(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS.mappedFeature()) && hasSign && !negative) {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedNumberChar('+', "JSON spec does not allow numbers to have plus signs: enable `JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS` to allow");
         }
         final String message = negative ?
                 "expected digit (0-9) to follow minus sign, for valid numeric value" :
                 "expected digit (0-9) for valid numeric value";
-        --_inputPtr; // for correct error reporting
         _reportUnexpectedNumberChar(ch, message);
         return null;
     }
@@ -1947,7 +1940,6 @@ protected String _handleOddName(int i) throws IOException
         }
         // [JACKSON-69]: allow unquoted names if feature enabled:
         if ((_features & FEAT_MASK_ALLOW_UNQUOTED_NAMES) == 0) {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(i, "was expecting double-quote to start field name");
         }
         final int[] codes = CharTypes.getInputCodeLatin1JsNames();
@@ -1962,7 +1954,6 @@ protected String _handleOddName(int i) throws IOException
             firstOk = Character.isJavaIdentifierPart((char) i);
         }
         if (!firstOk) {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(i, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");
         }
         int ptr = _inputPtr;
@@ -2094,7 +2085,6 @@ protected JsonToken _handleOddValue(int i) throws IOException
             _reportInvalidToken(""+((char) i), _validJsonTokenList());
         }
         // but if it doesn't look like a token:
-        --_inputPtr; // for correct error reporting
         _reportUnexpectedChar(i, "expected a valid value "+_validJsonValueList());
         return null;
     }
@@ -2397,7 +2387,6 @@ private final int _skipColon2(boolean gotColon) throws IOException
                     return i;
                 }
                 if (i != INT_COLON) {
-                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
                 }
                 gotColon = true;
@@ -2471,7 +2460,6 @@ private final int _skipColonFast(int ptr) throws IOException
     private final int _skipComma(int i) throws IOException
     {
         if (i != INT_COMMA) {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");
         }
         while (_inputPtr < _inputEnd) {
@@ -2614,7 +2602,6 @@ private int _skipWSOrEnd2() throws IOException
     private void _skipComment() throws IOException
     {
         if ((_features & FEAT_MASK_ALLOW_JAVA_COMMENTS) == 0) {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");
         }
         // First: check which comment (if either) it is:
@@ -2627,7 +2614,6 @@ private void _skipComment() throws IOException
         } else if (c == '*') {
             _skipCComment();
         } else {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");
         }
     }
@@ -2739,7 +2725,6 @@ protected char _decodeEscaped() throws IOException
             int ch = (int) _inputBuffer[_inputPtr++];
             int digit = CharTypes.charToHex(ch);
             if (digit < 0) {
-                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(ch, "expected a hex-digit for character escape sequence");
             }
             value = (value << 4) | digit;
@@ -3067,7 +3052,6 @@ private void _closeScope(int i) throws JsonParseException {
         if (i == INT_RBRACKET) {
             _updateLocation();
             if (!_parsingContext.inArray()) {
-                --_inputPtr; // for correct error reporting
                 _reportMismatchedEndMarker(i, '}');
             }
             _parsingContext = _parsingContext.clearAndGetParent();
@@ -3076,7 +3060,6 @@ private void _closeScope(int i) throws JsonParseException {
         if (i == INT_RCURLY) {
             _updateLocation();
             if (!_parsingContext.inObject()) {
-                --_inputPtr; // for correct error reporting
                 _reportMismatchedEndMarker(i, ']');
             }
             _parsingContext = _parsingContext.clearAndGetParent();
diff --git a/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java b/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
@@ -779,7 +779,6 @@ public JsonToken nextToken() throws IOException
         // Nope: do we then expect a comma?
         if (_parsingContext.expectComma()) {
             if (i != INT_COMMA) {
-                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");
             }
             i = _skipWS();
@@ -978,7 +977,6 @@ public boolean nextFieldName(SerializableString str) throws IOException
         // Nope: do we then expect a comma?
         if (_parsingContext.expectComma()) {
             if (i != INT_COMMA) {
-                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");
             }
             i = _skipWS();
@@ -1064,7 +1062,6 @@ public String nextFieldName() throws IOException
         // Nope: do we then expect a comma?
         if (_parsingContext.expectComma()) {
             if (i != INT_COMMA) {
-                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");
             }
             i = _skipWS();
@@ -1688,7 +1685,6 @@ private final JsonToken _parseFloat(char[] outBuf, int outPtr, int c,
             // must be followed by sequence of ints, one minimum
             if (fractLen == 0) {
                 if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {
-                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");
                 }
             }
@@ -1736,7 +1732,6 @@ private final JsonToken _parseFloat(char[] outBuf, int outPtr, int c,
             }
             // must be followed by sequence of ints, one minimum
             if (expLen == 0) {
-                --_inputPtr; // for correct error reporting
                 _reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");
             }
         }
@@ -2149,7 +2144,6 @@ protected String _handleOddName(int ch) throws IOException
         // Allow unquoted names if feature enabled:
         if ((_features & FEAT_MASK_ALLOW_UNQUOTED_NAMES) == 0) {
             char c = (char) _decodeCharForError(ch);
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(c, "was expecting double-quote to start field name");
         }
         /* Also: note that although we use a different table here,
@@ -2159,7 +2153,6 @@ protected String _handleOddName(int ch) throws IOException
         final int[] codes = CharTypes.getInputCodeUtf8JsNames();
         // Also: must start with a valid character...
         if (codes[ch] != 0) {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(ch, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");
         }
 
@@ -2765,7 +2758,6 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException
         case '}':
             // Error: neither is valid at this point; valid closers have
             // been handled earlier
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(c, "expected a value");
         case '\'':
             if ((_features & FEAT_MASK_ALLOW_SINGLE_QUOTES) != 0) {
@@ -2799,7 +2791,6 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException
             _reportInvalidToken(""+((char) c), _validJsonTokenList());
         }
         // but if it doesn't look like a token:
-        --_inputPtr; // for correct error reporting
         _reportUnexpectedChar(c, "expected a valid value "+_validJsonValueList());
         return null;
     }
@@ -2932,13 +2923,11 @@ protected JsonToken _handleInvalidNumberStart(int ch, final boolean neg, final b
                     match);
         }
         if (!isEnabled(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS.mappedFeature()) && hasSign && !neg) {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedNumberChar('+', "JSON spec does not allow numbers to have plus signs: enable `JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS` to allow");
         }
         final String message = neg ?
                 "expected digit (0-9) to follow minus sign, for valid numeric value" :
                 "expected digit (0-9) for valid numeric value";
-        --_inputPtr; // for correct error reporting
         _reportUnexpectedNumberChar(ch, message);
         return null;
     }
@@ -3264,7 +3253,6 @@ private final int _skipColon2(boolean gotColon) throws IOException
                     return i;
                 }
                 if (i != INT_COLON) {
-                    --_inputPtr; // for correct error reporting
                     _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
                 }
                 gotColon = true;
@@ -3287,7 +3275,6 @@ private final int _skipColon2(boolean gotColon) throws IOException
     private final void _skipComment() throws IOException
     {
         if ((_features & FEAT_MASK_ALLOW_JAVA_COMMENTS) == 0) {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");
         }
         // First: check which comment (if either) it is:
@@ -3300,7 +3287,6 @@ private final void _skipComment() throws IOException
         } else if (c == INT_ASTERISK) {
             _skipCComment();
         } else {
-            --_inputPtr; // for correct error reporting
             _reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");
         }
     }
@@ -3446,7 +3432,6 @@ protected char _decodeEscaped() throws IOException
             int ch = _inputBuffer[_inputPtr++];
             int digit = CharTypes.charToHex(ch);
             if (digit < 0) {
-                --_inputPtr; // for correct error reporting
                 _reportUnexpectedChar(ch & 0xFF, "expected a hex-digit for character escape sequence");
             }
             value = (value << 4) | digit;
@@ -3938,7 +3923,6 @@ private final JsonToken _closeScope(int i) throws JsonParseException {
     private final void _closeArrayScope() throws JsonParseException {
         _updateLocation();
         if (!_parsingContext.inArray()) {
-            --_inputPtr; // for correct error reporting
             _reportMismatchedEndMarker(']', '}');
         }
         _parsingContext = _parsingContext.clearAndGetParent();
@@ -3947,7 +3931,6 @@ private final void _closeArrayScope() throws JsonParseException {
     private final void _closeObjectScope() throws JsonParseException {
         _updateLocation();
         if (!_parsingContext.inObject()) {
-            --_inputPtr; // for correct error reporting
             _reportMismatchedEndMarker('}', ']');
         }
         _parsingContext = _parsingContext.clearAndGetParent();
diff --git a/src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingJsonParserBase.java b/src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingJsonParserBase.java
@@ -597,7 +597,6 @@ protected final JsonToken _startObjectScope() throws IOException
     protected final JsonToken _closeArrayScope() throws IOException
     {
         if (!_parsingContext.inArray()) {
-            --_inputPtr; // for correct error reporting
             _reportMismatchedEndMarker(']', '}');
         }
         JsonReadContext ctxt = _parsingContext.getParent();
@@ -618,7 +617,6 @@ protected final JsonToken _closeArrayScope() throws IOException
     protected final JsonToken _closeObjectScope() throws IOException
     {
         if (!_parsingContext.inObject()) {
-            --_inputPtr; // for correct error reporting
             _reportMismatchedEndMarker('}', ']');
         }
         JsonReadContext ctxt = _parsingContext.getParent();
diff --git a/src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.java b/src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.java
diff --git a/src/test/java/com/fasterxml/jackson/failing/read/LocationOfError1173Test.java b/src/test/java/com/fasterxml/jackson/failing/read/LocationOfError1173Test.java

Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,6 @@ public final JsonToken nextToken() throws IOException`
`769`	`769`	`case '}':`
`770`	`770`	`// Error: } is not valid at this point; valid closers have`
`771`	`771`	`// been handled earlier`
`772`		`- --_inputPtr; // for correct error reporting`
`773`	`772`	`_reportUnexpectedChar(i, "expected a value");`
`774`	`773`	`case 't':`
`775`	`774`	`_matchTrue();`
`@@ -1456,7 +1455,6 @@ private final JsonToken _parseFloat(int ch, int startPtr, int ptr, boolean neg,`
`1456`	`1455`	`// must be followed by sequence of ints, one minimum`
`1457`	`1456`	`if (fractLen == 0) {`
`1458`	`1457`	`if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {`
`1459`		`- --_inputPtr; // for correct error reporting`
`1460`	`1458`	`_reportUnexpectedNumberChar(ch, "Decimal point not followed by a digit");`
`1461`	`1459`	`}`
`1462`	`1460`	`}`
`@@ -1486,7 +1484,6 @@ private final JsonToken _parseFloat(int ch, int startPtr, int ptr, boolean neg,`
`1486`	`1484`	`}`
`1487`	`1485`	`// must be followed by sequence of ints, one minimum`
`1488`	`1486`	`if (expLen == 0) {`
`1489`		`- --_inputPtr; // for correct error reporting`
`1490`	`1487`	`_reportUnexpectedNumberChar(ch, "Exponent indicator not followed by a digit");`
`1491`	`1488`	`}`
`1492`	`1489`	`}`
`@@ -1647,7 +1644,6 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept`
`1647`	`1644`	`// must be followed by sequence of ints, one minimum`
`1648`	`1645`	`if (fractLen == 0) {`
`1649`	`1646`	`if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {`
`1650`		`- --_inputPtr; // for correct error reporting`
`1651`	`1647`	`_reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");`
`1652`	`1648`	`}`
`1653`	`1649`	`}`
`@@ -1692,7 +1688,6 @@ private final JsonToken _parseNumber2(boolean neg, int startPtr) throws IOExcept`
`1692`	`1688`	`}`
`1693`	`1689`	`// must be followed by sequence of ints, one minimum`
`1694`	`1690`	`if (expLen == 0) {`
`1695`		`- --_inputPtr; // for correct error reporting`
`1696`	`1691`	`_reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");`
`1697`	`1692`	`}`
`1698`	`1693`	`}`
`@@ -1793,13 +1788,11 @@ protected JsonToken _handleInvalidNumberStart(int ch, final boolean negative, fi`
`1793`	`1788`	`}`
`1794`	`1789`	`}`
`1795`	`1790`	`if (!isEnabled(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS.mappedFeature()) && hasSign && !negative) {`
`1796`		`- --_inputPtr; // for correct error reporting`
`1797`	`1791`	_reportUnexpectedNumberChar('+', "JSON spec does not allow numbers to have plus signs: enable `JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS` to allow");
`1798`	`1792`	`}`
`1799`	`1793`	`final String message = negative ?`
`1800`	`1794`	`"expected digit (0-9) to follow minus sign, for valid numeric value" :`
`1801`	`1795`	`"expected digit (0-9) for valid numeric value";`
`1802`		`- --_inputPtr; // for correct error reporting`
`1803`	`1796`	`_reportUnexpectedNumberChar(ch, message);`
`1804`	`1797`	`return null;`
`1805`	`1798`	`}`
`@@ -1947,7 +1940,6 @@ protected String _handleOddName(int i) throws IOException`
`1947`	`1940`	`}`
`1948`	`1941`	`// [JACKSON-69]: allow unquoted names if feature enabled:`
`1949`	`1942`	`if ((_features & FEAT_MASK_ALLOW_UNQUOTED_NAMES) == 0) {`
`1950`		`- --_inputPtr; // for correct error reporting`
`1951`	`1943`	`_reportUnexpectedChar(i, "was expecting double-quote to start field name");`
`1952`	`1944`	`}`
`1953`	`1945`	`final int[] codes = CharTypes.getInputCodeLatin1JsNames();`
`@@ -1962,7 +1954,6 @@ protected String _handleOddName(int i) throws IOException`
`1962`	`1954`	`firstOk = Character.isJavaIdentifierPart((char) i);`
`1963`	`1955`	`}`
`1964`	`1956`	`if (!firstOk) {`
`1965`		`- --_inputPtr; // for correct error reporting`
`1966`	`1957`	`_reportUnexpectedChar(i, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");`
`1967`	`1958`	`}`
`1968`	`1959`	`int ptr = _inputPtr;`
`@@ -2094,7 +2085,6 @@ protected JsonToken _handleOddValue(int i) throws IOException`
`2094`	`2085`	`_reportInvalidToken(""+((char) i), _validJsonTokenList());`
`2095`	`2086`	`}`
`2096`	`2087`	`// but if it doesn't look like a token:`
`2097`		`- --_inputPtr; // for correct error reporting`
`2098`	`2088`	`_reportUnexpectedChar(i, "expected a valid value "+_validJsonValueList());`
`2099`	`2089`	`return null;`
`2100`	`2090`	`}`
`@@ -2397,7 +2387,6 @@ private final int _skipColon2(boolean gotColon) throws IOException`
`2397`	`2387`	`return i;`
`2398`	`2388`	`}`
`2399`	`2389`	`if (i != INT_COLON) {`
`2400`		`- --_inputPtr; // for correct error reporting`
`2401`	`2390`	`_reportUnexpectedChar(i, "was expecting a colon to separate field name and value");`
`2402`	`2391`	`}`
`2403`	`2392`	`gotColon = true;`
`@@ -2471,7 +2460,6 @@ private final int _skipColonFast(int ptr) throws IOException`
`2471`	`2460`	`private final int _skipComma(int i) throws IOException`
`2472`	`2461`	`{`
`2473`	`2462`	`if (i != INT_COMMA) {`
`2474`		`- --_inputPtr; // for correct error reporting`
`2475`	`2463`	`_reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");`
`2476`	`2464`	`}`
`2477`	`2465`	`while (_inputPtr < _inputEnd) {`
`@@ -2614,7 +2602,6 @@ private int _skipWSOrEnd2() throws IOException`
`2614`	`2602`	`private void _skipComment() throws IOException`
`2615`	`2603`	`{`
`2616`	`2604`	`if ((_features & FEAT_MASK_ALLOW_JAVA_COMMENTS) == 0) {`
`2617`		`- --_inputPtr; // for correct error reporting`
`2618`	`2605`	`_reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");`
`2619`	`2606`	`}`
`2620`	`2607`	`// First: check which comment (if either) it is:`
`@@ -2627,7 +2614,6 @@ private void _skipComment() throws IOException`
`2627`	`2614`	`} else if (c == '*') {`
`2628`	`2615`	`_skipCComment();`
`2629`	`2616`	`} else {`
`2630`		`- --_inputPtr; // for correct error reporting`
`2631`	`2617`	`_reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");`
`2632`	`2618`	`}`
`2633`	`2619`	`}`
`@@ -2739,7 +2725,6 @@ protected char _decodeEscaped() throws IOException`
`2739`	`2725`	`int ch = (int) _inputBuffer[_inputPtr++];`
`2740`	`2726`	`int digit = CharTypes.charToHex(ch);`
`2741`	`2727`	`if (digit < 0) {`
`2742`		`- --_inputPtr; // for correct error reporting`
`2743`	`2728`	`_reportUnexpectedChar(ch, "expected a hex-digit for character escape sequence");`
`2744`	`2729`	`}`
`2745`	`2730`	`value = (value << 4) \| digit;`
`@@ -3067,7 +3052,6 @@ private void _closeScope(int i) throws JsonParseException {`
`3067`	`3052`	`if (i == INT_RBRACKET) {`
`3068`	`3053`	`_updateLocation();`
`3069`	`3054`	`if (!_parsingContext.inArray()) {`
`3070`		`- --_inputPtr; // for correct error reporting`
`3071`	`3055`	`_reportMismatchedEndMarker(i, '}');`
`3072`	`3056`	`}`
`3073`	`3057`	`_parsingContext = _parsingContext.clearAndGetParent();`
`@@ -3076,7 +3060,6 @@ private void _closeScope(int i) throws JsonParseException {`
`3076`	`3060`	`if (i == INT_RCURLY) {`
`3077`	`3061`	`_updateLocation();`
`3078`	`3062`	`if (!_parsingContext.inObject()) {`
`3079`		`- --_inputPtr; // for correct error reporting`
`3080`	`3063`	`_reportMismatchedEndMarker(i, ']');`
`3081`	`3064`	`}`
`3082`	`3065`	`_parsingContext = _parsingContext.clearAndGetParent();`
Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,6 @@ public JsonToken nextToken() throws IOException`
`779`	`779`	`// Nope: do we then expect a comma?`
`780`	`780`	`if (_parsingContext.expectComma()) {`
`781`	`781`	`if (i != INT_COMMA) {`
`782`		`- --_inputPtr; // for correct error reporting`
`783`	`782`	`_reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");`
`784`	`783`	`}`
`785`	`784`	`i = _skipWS();`
`@@ -978,7 +977,6 @@ public boolean nextFieldName(SerializableString str) throws IOException`
`978`	`977`	`// Nope: do we then expect a comma?`
`979`	`978`	`if (_parsingContext.expectComma()) {`
`980`	`979`	`if (i != INT_COMMA) {`
`981`		`- --_inputPtr; // for correct error reporting`
`982`	`980`	`_reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");`
`983`	`981`	`}`
`984`	`982`	`i = _skipWS();`
`@@ -1064,7 +1062,6 @@ public String nextFieldName() throws IOException`
`1064`	`1062`	`// Nope: do we then expect a comma?`
`1065`	`1063`	`if (_parsingContext.expectComma()) {`
`1066`	`1064`	`if (i != INT_COMMA) {`
`1067`		`- --_inputPtr; // for correct error reporting`
`1068`	`1065`	`_reportUnexpectedChar(i, "was expecting comma to separate "+_parsingContext.typeDesc()+" entries");`
`1069`	`1066`	`}`
`1070`	`1067`	`i = _skipWS();`
`@@ -1688,7 +1685,6 @@ private final JsonToken _parseFloat(char[] outBuf, int outPtr, int c,`
`1688`	`1685`	`// must be followed by sequence of ints, one minimum`
`1689`	`1686`	`if (fractLen == 0) {`
`1690`	`1687`	`if (!isEnabled(JsonReadFeature.ALLOW_TRAILING_DECIMAL_POINT_FOR_NUMBERS.mappedFeature())) {`
`1691`		`- --_inputPtr; // for correct error reporting`
`1692`	`1688`	`_reportUnexpectedNumberChar(c, "Decimal point not followed by a digit");`
`1693`	`1689`	`}`
`1694`	`1690`	`}`
`@@ -1736,7 +1732,6 @@ private final JsonToken _parseFloat(char[] outBuf, int outPtr, int c,`
`1736`	`1732`	`}`
`1737`	`1733`	`// must be followed by sequence of ints, one minimum`
`1738`	`1734`	`if (expLen == 0) {`
`1739`		`- --_inputPtr; // for correct error reporting`
`1740`	`1735`	`_reportUnexpectedNumberChar(c, "Exponent indicator not followed by a digit");`
`1741`	`1736`	`}`
`1742`	`1737`	`}`
`@@ -2149,7 +2144,6 @@ protected String _handleOddName(int ch) throws IOException`
`2149`	`2144`	`// Allow unquoted names if feature enabled:`
`2150`	`2145`	`if ((_features & FEAT_MASK_ALLOW_UNQUOTED_NAMES) == 0) {`
`2151`	`2146`	`char c = (char) _decodeCharForError(ch);`
`2152`		`- --_inputPtr; // for correct error reporting`
`2153`	`2147`	`_reportUnexpectedChar(c, "was expecting double-quote to start field name");`
`2154`	`2148`	`}`
`2155`	`2149`	`/* Also: note that although we use a different table here,`
`@@ -2159,7 +2153,6 @@ protected String _handleOddName(int ch) throws IOException`
`2159`	`2153`	`final int[] codes = CharTypes.getInputCodeUtf8JsNames();`
`2160`	`2154`	`// Also: must start with a valid character...`
`2161`	`2155`	`if (codes[ch] != 0) {`
`2162`		`- --_inputPtr; // for correct error reporting`
`2163`	`2156`	`_reportUnexpectedChar(ch, "was expecting either valid name character (for unquoted name) or double-quote (for quoted) to start field name");`
`2164`	`2157`	`}`
`2165`	`2158`
`@@ -2765,7 +2758,6 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException`
`2765`	`2758`	`case '}':`
`2766`	`2759`	`// Error: neither is valid at this point; valid closers have`
`2767`	`2760`	`// been handled earlier`
`2768`		`- --_inputPtr; // for correct error reporting`
`2769`	`2761`	`_reportUnexpectedChar(c, "expected a value");`
`2770`	`2762`	`case '\'':`
`2771`	`2763`	`if ((_features & FEAT_MASK_ALLOW_SINGLE_QUOTES) != 0) {`
`@@ -2799,7 +2791,6 @@ protected JsonToken _handleUnexpectedValue(int c) throws IOException`
`2799`	`2791`	`_reportInvalidToken(""+((char) c), _validJsonTokenList());`
`2800`	`2792`	`}`
`2801`	`2793`	`// but if it doesn't look like a token:`
`2802`		`- --_inputPtr; // for correct error reporting`
`2803`	`2794`	`_reportUnexpectedChar(c, "expected a valid value "+_validJsonValueList());`
`2804`	`2795`	`return null;`
`2805`	`2796`	`}`
`@@ -2932,13 +2923,11 @@ protected JsonToken _handleInvalidNumberStart(int ch, final boolean neg, final b`
`2932`	`2923`	`match);`
`2933`	`2924`	`}`
`2934`	`2925`	`if (!isEnabled(JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS.mappedFeature()) && hasSign && !neg) {`
`2935`		`- --_inputPtr; // for correct error reporting`
`2936`	`2926`	_reportUnexpectedNumberChar('+', "JSON spec does not allow numbers to have plus signs: enable `JsonReadFeature.ALLOW_LEADING_PLUS_SIGN_FOR_NUMBERS` to allow");
`2937`	`2927`	`}`
`2938`	`2928`	`final String message = neg ?`
`2939`	`2929`	`"expected digit (0-9) to follow minus sign, for valid numeric value" :`
`2940`	`2930`	`"expected digit (0-9) for valid numeric value";`
`2941`		`- --_inputPtr; // for correct error reporting`
`2942`	`2931`	`_reportUnexpectedNumberChar(ch, message);`
`2943`	`2932`	`return null;`
`2944`	`2933`	`}`
`@@ -3264,7 +3253,6 @@ private final int _skipColon2(boolean gotColon) throws IOException`
`3264`	`3253`	`return i;`
`3265`	`3254`	`}`
`3266`	`3255`	`if (i != INT_COLON) {`
`3267`		`- --_inputPtr; // for correct error reporting`
`3268`	`3256`	`_reportUnexpectedChar(i, "was expecting a colon to separate field name and value");`
`3269`	`3257`	`}`
`3270`	`3258`	`gotColon = true;`
`@@ -3287,7 +3275,6 @@ private final int _skipColon2(boolean gotColon) throws IOException`
`3287`	`3275`	`private final void _skipComment() throws IOException`
`3288`	`3276`	`{`
`3289`	`3277`	`if ((_features & FEAT_MASK_ALLOW_JAVA_COMMENTS) == 0) {`
`3290`		`- --_inputPtr; // for correct error reporting`
`3291`	`3278`	`_reportUnexpectedChar('/', "maybe a (non-standard) comment? (not recognized as one since Feature 'ALLOW_COMMENTS' not enabled for parser)");`
`3292`	`3279`	`}`
`3293`	`3280`	`// First: check which comment (if either) it is:`
`@@ -3300,7 +3287,6 @@ private final void _skipComment() throws IOException`
`3300`	`3287`	`} else if (c == INT_ASTERISK) {`
`3301`	`3288`	`_skipCComment();`
`3302`	`3289`	`} else {`
`3303`		`- --_inputPtr; // for correct error reporting`
`3304`	`3290`	`_reportUnexpectedChar(c, "was expecting either '*' or '/' for a comment");`
`3305`	`3291`	`}`
`3306`	`3292`	`}`
`@@ -3446,7 +3432,6 @@ protected char _decodeEscaped() throws IOException`
`3446`	`3432`	`int ch = _inputBuffer[_inputPtr++];`
`3447`	`3433`	`int digit = CharTypes.charToHex(ch);`
`3448`	`3434`	`if (digit < 0) {`
`3449`		`- --_inputPtr; // for correct error reporting`
`3450`	`3435`	`_reportUnexpectedChar(ch & 0xFF, "expected a hex-digit for character escape sequence");`
`3451`	`3436`	`}`
`3452`	`3437`	`value = (value << 4) \| digit;`
`@@ -3938,7 +3923,6 @@ private final JsonToken _closeScope(int i) throws JsonParseException {`
`3938`	`3923`	`private final void _closeArrayScope() throws JsonParseException {`
`3939`	`3924`	`_updateLocation();`
`3940`	`3925`	`if (!_parsingContext.inArray()) {`
`3941`		`- --_inputPtr; // for correct error reporting`
`3942`	`3926`	`_reportMismatchedEndMarker(']', '}');`
`3943`	`3927`	`}`
`3944`	`3928`	`_parsingContext = _parsingContext.clearAndGetParent();`
`@@ -3947,7 +3931,6 @@ private final void _closeArrayScope() throws JsonParseException {`
`3947`	`3931`	`private final void _closeObjectScope() throws JsonParseException {`
`3948`	`3932`	`_updateLocation();`
`3949`	`3933`	`if (!_parsingContext.inObject()) {`
`3950`		`- --_inputPtr; // for correct error reporting`
`3951`	`3934`	`_reportMismatchedEndMarker('}', ']');`
`3952`	`3935`	`}`
`3953`	`3936`	`_parsingContext = _parsingContext.clearAndGetParent();`
Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,6 @@ protected final JsonToken _startObjectScope() throws IOException`
`597`	`597`	`protected final JsonToken _closeArrayScope() throws IOException`
`598`	`598`	`{`
`599`	`599`	`if (!_parsingContext.inArray()) {`
`600`		`- --_inputPtr; // for correct error reporting`
`601`	`600`	`_reportMismatchedEndMarker(']', '}');`
`602`	`601`	`}`
`603`	`602`	`JsonReadContext ctxt = _parsingContext.getParent();`
`@@ -618,7 +617,6 @@ protected final JsonToken _closeArrayScope() throws IOException`
`618`	`617`	`protected final JsonToken _closeObjectScope() throws IOException`
`619`	`618`	`{`
`620`	`619`	`if (!_parsingContext.inObject()) {`
`621`		`- --_inputPtr; // for correct error reporting`
`622`	`620`	`_reportMismatchedEndMarker('}', ']');`
`623`	`621`	`}`
`624`	`622`	`JsonReadContext ctxt = _parsingContext.getParent();`