Skip to content

Commit

Permalink
Finished #47 implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
@cowtowncoder
cowtowncoder committed Sep 19, 2013
1 parent 89d5f32 commit 0a39869
Show file tree
Hide file tree
Showing 3 changed files with 153 additions and 143 deletions.
2 changes: 0 additions & 2 deletions src/main/java/com/fasterxml/jackson/core/base/ParserMinimalBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
* Note that 'minimal' here mostly refers to minimal number of fields
* (size) and functionality that is specific to certain types
* of parser implementations; but not necessarily to number of methods.
*
* @author Tatu Saloranta
*/
public abstract class ParserMinimalBase
extends JsonParser
Expand Down
131 changes: 82 additions & 49 deletions src/main/java/com/fasterxml/jackson/core/json/ReaderBasedJsonParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
public final class ReaderBasedJsonParser
extends ParserBase
{
// Latin1 encoding is not supported, but we do use 8-bit subset for
// pre-processing task, to simplify first pass, keep it fast.
protected final static int[] _icLatin1 = CharTypes.getInputCodeLatin1();

// White-space processing is done all the time, pre-fetch as well
private final static int[] _icWS = CharTypes.getInputCodeWS();

/*
/**********************************************************
/* Input configuration
Expand Down Expand Up @@ -664,10 +671,10 @@ public JsonToken nextToken()
case '7':
case '8':
case '9':
t = parseNumberText(i);
t = _parseNumber(i);
break;
default:
t = _handleUnexpectedValue(i);
t = _handleOddValue(i);
break;
}

Expand Down Expand Up @@ -818,7 +825,6 @@ public void close() throws IOException
/*
/**********************************************************
/* Internal methods, number parsing
/* (note: in 1.8 and prior, part of "ReaderBasedNumericParser"
/**********************************************************
*/

Expand All @@ -837,8 +843,7 @@ public void close() throws IOException
* deferred, since it is usually the most complicated and costliest
* part of processing.
*/
protected JsonToken parseNumberText(int ch)
throws IOException, JsonParseException
protected JsonToken _parseNumber(int ch) throws IOException
{
/* Although we will always be complete with respect to textual
* representation (that is, all characters will be parsed),
Expand Down Expand Up @@ -950,7 +955,7 @@ protected JsonToken parseNumberText(int ch)
} while (false);

_inputPtr = negative ? (startPtr+1) : startPtr;
return parseNumberText2(negative);
return _parseNumber2(negative);
}

/**
Expand All @@ -960,8 +965,7 @@ protected JsonToken parseNumberText(int ch)
* that it has to explicitly copy contents to the text buffer
* instead of just sharing the main input buffer.
*/
private JsonToken parseNumberText2(boolean negative)
throws IOException, JsonParseException
private JsonToken _parseNumber2(boolean negative) throws IOException
{
char[] outBuf = _textBuffer.emptyAndGetCurrentSegment();
int outPtr = 0;
Expand Down Expand Up @@ -1084,8 +1088,7 @@ private JsonToken parseNumberText2(boolean negative)
* Method called when we have seen one zero, and want to ensure
* it is not followed by another
*/
private char _verifyNoLeadingZeroes()
throws IOException, JsonParseException
private char _verifyNoLeadingZeroes() throws IOException
{
// Ok to have plain "0"
if (_inputPtr >= _inputEnd && !loadMore()) {
Expand Down Expand Up @@ -1120,8 +1123,7 @@ private char _verifyNoLeadingZeroes()
* Method called if expected numeric value (due to leading sign) does not
* look like a number
*/
protected JsonToken _handleInvalidNumberStart(int ch, boolean negative)
throws IOException, JsonParseException
protected JsonToken _handleInvalidNumberStart(int ch, boolean negative) throws IOException
{
if (ch == 'I') {
if (_inputPtr >= _inputEnd) {
Expand Down Expand Up @@ -1170,7 +1172,7 @@ protected String _parseName(int i) throws IOException
final int inputLen = _inputEnd;

if (ptr < inputLen) {
final int[] codes = CharTypes.getInputCodeLatin1();
final int[] codes = _icLatin1;
final int maxCode = codes.length;

do {
Expand All @@ -1190,10 +1192,10 @@ protected String _parseName(int i) throws IOException

int start = _inputPtr;
_inputPtr = ptr;
return _parseFieldName2(start, hash, INT_QUOTE);
return _parseName2(start, hash, INT_QUOTE);
}

private String _parseFieldName2(int startPtr, int hash, int endChar) throws IOException
private String _parseName2(int startPtr, int hash, int endChar) throws IOException
{
_textBuffer.resetWithShared(_inputBuffer, startPtr, (_inputPtr - startPtr));

Expand Down Expand Up @@ -1313,7 +1315,7 @@ protected String _parseAposName() throws IOException
final int inputLen = _inputEnd;

if (ptr < inputLen) {
final int[] codes = CharTypes.getInputCodeLatin1();
final int[] codes = _icLatin1;
final int maxCode = codes.length;

do {
Expand All @@ -1334,14 +1336,14 @@ protected String _parseAposName() throws IOException
int start = _inputPtr;
_inputPtr = ptr;

return _parseFieldName2(start, hash, '\'');
return _parseName2(start, hash, '\'');
}

/**
* Method for handling cases where first non-space character
* of an expected value token is not legal for standard JSON content.
*/
protected JsonToken _handleUnexpectedValue(int i) throws IOException
protected JsonToken _handleOddValue(int i) throws IOException
{
// Most likely an error, unless we are to allow single-quote-strings
switch (i) {
Expand Down Expand Up @@ -1484,7 +1486,7 @@ protected void _finishString() throws IOException
final int inputLen = _inputEnd;

if (ptr < inputLen) {
final int[] codes = CharTypes.getInputCodeLatin1();
final int[] codes = _icLatin1;
final int maxCode = codes.length;

do {
Expand Down Expand Up @@ -1621,47 +1623,69 @@ protected void _skipCR() throws IOException

private int _skipWS() throws IOException
{
final int[] codes = _icWS;
while (_inputPtr < _inputEnd || loadMore()) {
int i = (int) _inputBuffer[_inputPtr++];
if (i > INT_SPACE) {
if (i != INT_SLASH) {
return i;
}
if (i >= 64) {
return i;
}
switch (codes[i]) {
case -1:
_throwInvalidSpace(i);
case 0:
return i;
case 1:
continue;
case '\n':
++_currInputRow;
_currInputRowStart = _inputPtr;
break;
case '\r':
_skipCR();
break;
case '/':
_skipComment();
} else if (i != INT_SPACE) {
if (i == INT_LF) {
++_currInputRow;
_currInputRowStart = _inputPtr;
} else if (i == INT_CR) {
_skipCR();
} else if (i != INT_TAB) {
_throwInvalidSpace(i);
break;
case '#':
if (!_skipYAMLComment()) {
return i;
}
break;
}
}
throw _constructError("Unexpected end-of-input within/between "+_parsingContext.getTypeDesc()+" entries");
}

private int _skipWSOrEnd() throws IOException
{
while ((_inputPtr < _inputEnd) || loadMore()) {
final int[] codes = _icWS;
while (_inputPtr < _inputEnd || loadMore()) {
int i = (int) _inputBuffer[_inputPtr++];
if (i > INT_SPACE) {
if (i == INT_SLASH) {
_skipComment();
continue;
}
return i;
}
if (i != INT_SPACE) {
if (i == INT_LF) {
++_currInputRow;
_currInputRowStart = _inputPtr;
} else if (i == INT_CR) {
_skipCR();
} else if (i != INT_TAB) {
_throwInvalidSpace(i);
if (i >= 64) {
return i;
}
switch (codes[i]) {
case -1:
_throwInvalidSpace(i);
case 0:
return i;
case 1:
continue;
case '\n':
++_currInputRow;
_currInputRowStart = _inputPtr;
break;
case '\r':
_skipCR();
break;
case '/':
_skipComment();
break;
case '#':
if (!_skipYAMLComment()) {
return i;
}
break;
}
}
// We ran out of input...
Expand All @@ -1680,7 +1704,7 @@ private void _skipComment() throws IOException
}
char c = _inputBuffer[_inputPtr++];
if (c == '/') {
_skipCppComment();
_skipLine();
} else if (c == '*') {
_skipCComment();
} else {
Expand Down Expand Up @@ -1720,7 +1744,16 @@ private void _skipCComment() throws IOException
_reportInvalidEOF(" in a comment");
}

private void _skipCppComment() throws IOException
private boolean _skipYAMLComment() throws IOException
{
if (!isEnabled(Feature.ALLOW_YAML_COMMENTS)) {
return false;
}
_skipLine();
return true;
}

private void _skipLine() throws IOException
{
// Ok: need to find EOF or linefeed
while ((_inputPtr < _inputEnd) || loadMore()) {
Expand Down
Loading

0 comments on commit 0a39869

Please sign in to comment.