Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Nov 17, 2015
1 parent da7f2b7 commit 329756d
Showing 1 changed file with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class ReaderBasedJsonParser // final in 2.3, earlier
/**
* Method called when caller wants to provide input buffer directly,
* and it may or may not be recyclable use standard recycle context.
*
*
* @since 2.4
*/
public ReaderBasedJsonParser(IOContext ctxt, int features, Reader r,
Expand Down Expand Up @@ -130,7 +130,7 @@ public ReaderBasedJsonParser(IOContext ctxt, int features, Reader r,

@Override public ObjectCodec getCodec() { return _objectCodec; }
@Override public void setCodec(ObjectCodec c) { _objectCodec = c; }

@Override
public int releaseBuffered(Writer w) throws IOException {
int count = _inputEnd - _inputPtr;
Expand Down Expand Up @@ -210,7 +210,7 @@ protected void _releaseBuffers() throws IOException {
}
}
}

/*
/**********************************************************
/* Public API, data access
Expand Down Expand Up @@ -1043,7 +1043,7 @@ private final JsonToken _nextTokenNotInObject(int i) throws IOException
}
return (_currToken = _handleOddValue(i));
}

// note: identical to one in UTF8StreamJsonParser
@Override
public final String nextTextValue() throws IOException
Expand Down Expand Up @@ -1184,15 +1184,15 @@ protected final JsonToken _parsePosNumber(int ch) throws IOException
if (ch == INT_0) {
return _parseNumber2(false, startPtr);
}

/* First, let's see if the whole number is contained within
* the input buffer unsplit. This should be the common case;
* and to simplify processing, we will just reparse contents
* in the alternative case (number split on buffer boundary)
*/

int intLen = 1; // already got one

// First let's get the obligatory integer part:
int_loop:
while (true) {
Expand Down Expand Up @@ -1306,7 +1306,7 @@ protected final JsonToken _parseNegNumber() throws IOException
return _parseNumber2(true, startPtr);
}
int intLen = 1; // already got one

// First let's get the obligatory integer part:
int_loop:
while (true) {
Expand Down Expand Up @@ -1503,7 +1503,7 @@ private char _verifyNLZ2() throws IOException
return '0';
}
++_inputPtr; // skip previous zero
if (ch != '0') { // followed by other number; return
if (ch != '0') { // followed by other number; return
break;
}
}
Expand Down Expand Up @@ -1793,7 +1793,7 @@ protected JsonToken _handleOddValue(int i) throws IOException
_reportUnexpectedChar(i, "expected a valid value (number, String, array, object, 'true', 'false' or 'null')");
return null;
}

protected JsonToken _handleApos() throws IOException
{
char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
Expand Down Expand Up @@ -1834,7 +1834,7 @@ protected JsonToken _handleApos() throws IOException
_textBuffer.setCurrentLength(outPtr);
return JsonToken.VALUE_STRING;
}

private String _handleOddName2(int startPtr, int hash, int[] codes) throws IOException
{
_textBuffer.resetWithShared(_inputBuffer, startPtr, (_inputPtr - startPtr));
Expand Down Expand Up @@ -1878,7 +1878,7 @@ private String _handleOddName2(int startPtr, int hash, int[] codes) throws IOExc
return _symbols.findSymbol(buf, start, len, hash);
}
}

@Override
protected final void _finishString() throws IOException
{
Expand Down Expand Up @@ -2008,7 +2008,7 @@ protected final void _skipString() throws IOException
/* Internal methods, other parsing
/**********************************************************
*/

/**
* We actually need to check the character value here
* (to see if we have \n following \r).
Expand All @@ -2022,7 +2022,7 @@ protected final void _skipCR() throws IOException {
++_currInputRow;
_currInputRowStart = _inputPtr;
}

private final int _skipColon() throws IOException
{
if ((_inputPtr + 4) >= _inputEnd) {
Expand All @@ -2044,7 +2044,7 @@ private final int _skipColon() throws IOException
if (i == INT_SLASH || i == INT_HASH) {
return _skipColon2(true);
}
++_inputPtr;
++_inputPtr;
return i;
}
}
Expand Down Expand Up @@ -2166,7 +2166,7 @@ private final int _skipColonFast(int ptr) throws IOException
_inputPtr = ptr-1;
return _skipColon2(gotColon);
}

// Primary loop: no reloading, comment handling
private final int _skipComma(int i) throws IOException
{
Expand Down Expand Up @@ -2225,7 +2225,7 @@ private final int _skipAfterComma2() throws IOException
}
throw _constructError("Unexpected end-of-input within/between "+_parsingContext.getTypeDesc()+" entries");
}

private final int _skipWSOrEnd() throws IOException
{
// Let's handle first character separately since it is likely that
Expand Down Expand Up @@ -2253,7 +2253,7 @@ private final int _skipWSOrEnd() throws IOException
_throwInvalidSpace(i);
}
}

while (_inputPtr < _inputEnd) {
i = (int) _inputBuffer[_inputPtr++];
if (i > INT_SPACE) {
Expand Down Expand Up @@ -2309,7 +2309,7 @@ private int _skipWSOrEnd2() throws IOException
}
}
}

private void _skipComment() throws IOException
{
if (!isEnabled(Feature.ALLOW_COMMENTS)) {
Expand Down Expand Up @@ -2368,7 +2368,7 @@ private boolean _skipYAMLComment() throws IOException
_skipLine();
return true;
}

private void _skipLine() throws IOException
{
// Ok: need to find EOF or linefeed
Expand Down Expand Up @@ -2442,7 +2442,7 @@ protected char _decodeEscaped() throws IOException
}
return (char) value;
}

private final void _matchTrue() throws IOException {
int ptr = _inputPtr;
if ((ptr + 3) < _inputEnd) {
Expand Down Expand Up @@ -2563,9 +2563,9 @@ protected byte[] _decodeBase64(Base64Variant b64variant) throws IOException
}
}
int decodedData = bits;

// then second base64 char; can't get padding yet, nor ws

if (_inputPtr >= _inputEnd) {
loadMoreGuaranteed();
}
Expand All @@ -2575,7 +2575,7 @@ protected byte[] _decodeBase64(Base64Variant b64variant) throws IOException
bits = _decodeBase64Escape(b64variant, ch, 1);
}
decodedData = (decodedData << 6) | bits;

// third base64 char; can be padding, but not ws
if (_inputPtr >= _inputEnd) {
loadMoreGuaranteed();
Expand Down Expand Up @@ -2655,7 +2655,7 @@ protected byte[] _decodeBase64(Base64Variant b64variant) throws IOException
protected void _reportInvalidToken(String matchedPart) throws IOException {
_reportInvalidToken(matchedPart, "'null', 'true', 'false' or NaN");
}

protected void _reportInvalidToken(String matchedPart, String msg) throws IOException
{
StringBuilder sb = new StringBuilder(matchedPart);
Expand Down

0 comments on commit 329756d

Please sign in to comment.