Skip to content

Commit

Permalink
use _updateToken (#504)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pjfanning
pjfanning authored Jun 28, 2024
1 parent 6c32905 commit 7af6e97
Show file tree
Hide file tree
Showing 6 changed files with 151 additions and 172 deletions.
8 changes: 4 additions & 4 deletions avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/AvroParserImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ public String nextFieldName() throws IOException
_binaryValue = null;
String name = _avroContext.nextFieldName();
if (name == null) {
_currToken = _avroContext.getCurrentToken();
_nullSafeUpdateToken(_avroContext.getCurrentToken());
return null;
}
_currToken = JsonToken.FIELD_NAME;
_updateToken(JsonToken.FIELD_NAME);
return name;
}

Expand All @@ -124,10 +124,10 @@ public boolean nextFieldName(SerializableString sstr) throws IOException
_binaryValue = null;
String name = _avroContext.nextFieldName();
if (name == null) {
_currToken = _avroContext.getCurrentToken();
_nullSafeUpdateToken(_avroContext.getCurrentToken());
return false;
}
_currToken = JsonToken.FIELD_NAME;
_updateToken(JsonToken.FIELD_NAME);
return name.equals(sstr.getValue());
}

Expand Down
72 changes: 36 additions & 36 deletions cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,16 +791,16 @@ public JsonToken nextToken() throws IOException
if (!_streamReadContext.expectMoreValues()) {
_stringRefs.pop();
_streamReadContext = _streamReadContext.getParent();
return (_currToken = JsonToken.END_OBJECT);
return _updateToken(JsonToken.END_OBJECT);
}
return (_currToken = _decodePropertyName());
return _updateToken(_decodePropertyName());
}
} else {
if (!_streamReadContext.expectMoreValues()) {
_stringRefs.pop();
_tagValues.clear();
_streamReadContext = _streamReadContext.getParent();
return (_currToken = JsonToken.END_ARRAY);
return _updateToken(JsonToken.END_ARRAY);
}
}
if (_inputPtr >= _inputEnd) {
Expand Down Expand Up @@ -874,7 +874,7 @@ public JsonToken nextToken() throws IOException
if (!_tagValues.isEmpty()) {
return _handleTaggedInt(_tagValues);
}
return (_currToken = JsonToken.VALUE_NUMBER_INT);
return _updateToken(JsonToken.VALUE_NUMBER_INT);
case 1: // negative int
_numTypesValid = NR_INT;
if (lowBits <= 23) {
Expand Down Expand Up @@ -917,20 +917,20 @@ public JsonToken nextToken() throws IOException
_invalidToken(ch);
}
}
return (_currToken = JsonToken.VALUE_NUMBER_INT);
return _updateToken(JsonToken.VALUE_NUMBER_INT);

case 2: // byte[]
_typeByte = ch;
_tokenIncomplete = true;
if (!_tagValues.isEmpty()) {
return _handleTaggedBinary(_tagValues);
}
return (_currToken = JsonToken.VALUE_EMBEDDED_OBJECT);
return _updateToken(JsonToken.VALUE_EMBEDDED_OBJECT);

case 3: // String
_typeByte = ch;
_tokenIncomplete = true;
return (_currToken = JsonToken.VALUE_STRING);
return _updateToken(JsonToken.VALUE_STRING);

case 4: // Array
_stringRefs.push(stringrefNamespace);
Expand All @@ -941,11 +941,11 @@ public JsonToken nextToken() throws IOException
}
createChildArrayContext(len);
}
return (_currToken = JsonToken.START_ARRAY);
return _updateToken(JsonToken.START_ARRAY);

case 5: // Object
_stringRefs.push(stringrefNamespace);
_currToken = JsonToken.START_OBJECT;
_updateToken(JsonToken.START_OBJECT);
{
int len = _decodeExplicitLength(lowBits);
createChildObjectContext(len);
Expand All @@ -956,43 +956,43 @@ public JsonToken nextToken() throws IOException
default: // misc: tokens, floats
switch (lowBits) {
case 20:
return (_currToken = JsonToken.VALUE_FALSE);
return _updateToken(JsonToken.VALUE_FALSE);
case 21:
return (_currToken = JsonToken.VALUE_TRUE);
return _updateToken(JsonToken.VALUE_TRUE);
case 22:
return (_currToken = JsonToken.VALUE_NULL);
return _updateToken(JsonToken.VALUE_NULL);
case 23:
return (_currToken = _decodeUndefinedValue());
return _updateToken(_decodeUndefinedValue());

case 25: // 16-bit float...
// As per [http://stackoverflow.com/questions/5678432/decompressing-half-precision-floats-in-javascript]
{
_numberFloat = (float) _decodeHalfSizeFloat();
_numTypesValid = NR_FLOAT;
}
return (_currToken = JsonToken.VALUE_NUMBER_FLOAT);
return _updateToken(JsonToken.VALUE_NUMBER_FLOAT);
case 26: // Float32
{
_numberFloat = Float.intBitsToFloat(_decode32Bits());
_numTypesValid = NR_FLOAT;
}
return (_currToken = JsonToken.VALUE_NUMBER_FLOAT);
return _updateToken(JsonToken.VALUE_NUMBER_FLOAT);
case 27: // Float64
_numberDouble = Double.longBitsToDouble(_decode64Bits());
_numTypesValid = NR_DOUBLE;
return (_currToken = JsonToken.VALUE_NUMBER_FLOAT);
return _updateToken(JsonToken.VALUE_NUMBER_FLOAT);
case 31: // Break
if (_streamReadContext.inArray()) {
if (!_streamReadContext.hasExpectedLength()) {
_stringRefs.pop();
_streamReadContext = _streamReadContext.getParent();
return (_currToken = JsonToken.END_ARRAY);
return _updateToken(JsonToken.END_ARRAY);
}
}
// Object end-marker can't occur here
_reportUnexpectedBreak();
}
return (_currToken = _decodeSimpleValue(lowBits, ch));
return _updateToken(_decodeSimpleValue(lowBits, ch));
}
}

Expand Down Expand Up @@ -1072,7 +1072,7 @@ protected String _numberToName(int ch, boolean neg, TagList tags) throws IOExcep
protected JsonToken _handleTaggedInt(TagList tags) throws IOException {
// For now all we should get is stringref
if (!tags.contains(TAG_ID_STRINGREF)) {
return (_currToken = JsonToken.VALUE_NUMBER_INT);
return _updateToken(JsonToken.VALUE_NUMBER_INT);
}

if (_stringRefs.empty()) {
Expand All @@ -1090,7 +1090,7 @@ protected JsonToken _handleTaggedInt(TagList tags) throws IOException {
Object str = stringRefs.stringRefs.get(_numberInt);
if (str instanceof String) {
_sharedString = (String) str;
return (_currToken = JsonToken.VALUE_STRING);
return _updateToken(JsonToken.VALUE_STRING);
}
_binaryValue = (byte[]) str;
return _handleTaggedBinary(tags);
Expand All @@ -1110,7 +1110,7 @@ protected JsonToken _handleTaggedBinary(TagList tags) throws IOException
// 16-Jan-2024, tatu: Esoteric edge case where we have marked
// `int` as being tokenized
_numTypesValid = NR_UNKNOWN;
return (_currToken = JsonToken.VALUE_EMBEDDED_OBJECT);
return _updateToken(JsonToken.VALUE_EMBEDDED_OBJECT);
}

// First: get the data
Expand All @@ -1131,7 +1131,7 @@ protected JsonToken _handleTaggedBinary(TagList tags) throws IOException
}
_numTypesValid = NR_BIGINT;
_tagValues.clear();
return (_currToken = JsonToken.VALUE_NUMBER_INT);
return _updateToken(JsonToken.VALUE_NUMBER_INT);
}

protected JsonToken _handleTaggedArray(TagList tags, int len) throws IOException
Expand All @@ -1143,9 +1143,9 @@ protected JsonToken _handleTaggedArray(TagList tags, int len) throws IOException

// BigDecimal is the only thing we know for sure
if (!tags.contains(CBORConstants.TAG_DECIMAL_FRACTION)) {
return (_currToken = JsonToken.START_ARRAY);
return _updateToken(JsonToken.START_ARRAY);
}
_currToken = JsonToken.START_ARRAY;
_updateToken(JsonToken.START_ARRAY);

// but has to have length of 2; otherwise we have a problem...
if (len != 2) {
Expand Down Expand Up @@ -1181,7 +1181,7 @@ protected JsonToken _handleTaggedArray(TagList tags, int len) throws IOException
// which needs to be reset here
_numberBigDecimal = dec;
_numTypesValid = NR_BIGDECIMAL;
return (_currToken = JsonToken.VALUE_NUMBER_FLOAT);
return _updateToken(JsonToken.VALUE_NUMBER_FLOAT);
}

/**
Expand All @@ -1200,7 +1200,7 @@ protected final boolean _checkNextIsIntInArray(final String typeDesc) throws IOE
_tagValues.clear();
_stringRefs.pop();
_streamReadContext = _streamReadContext.getParent();
_currToken = JsonToken.END_ARRAY;
_updateToken(JsonToken.END_ARRAY);
return false;
}

Expand Down Expand Up @@ -1273,7 +1273,7 @@ protected final boolean _checkNextIsIntInArray(final String typeDesc) throws IOE
}
}
if (tagValues == null) {
_currToken = JsonToken.VALUE_NUMBER_INT;
_updateToken(JsonToken.VALUE_NUMBER_INT);
} else {
_handleTaggedInt(tagValues);
}
Expand Down Expand Up @@ -1320,7 +1320,7 @@ protected final boolean _checkNextIsIntInArray(final String typeDesc) throws IOE
_invalidToken(ch);
}
}
_currToken = JsonToken.VALUE_NUMBER_INT;
_updateToken(JsonToken.VALUE_NUMBER_INT);
return true;

case 2: // byte[]
Expand All @@ -1330,7 +1330,7 @@ protected final boolean _checkNextIsIntInArray(final String typeDesc) throws IOE
}
_typeByte = ch;
_tokenIncomplete = true;
_currToken = _handleTaggedBinary(tagValues);
_updateToken(_handleTaggedBinary(tagValues));
return (_currToken == JsonToken.VALUE_NUMBER_INT);
}

Expand All @@ -1348,7 +1348,7 @@ protected final boolean _checkNextIsEndArray() throws IOException
_tagValues.clear();
_stringRefs.pop();
_streamReadContext = _streamReadContext.getParent();
_currToken = JsonToken.END_ARRAY;
_updateToken(JsonToken.END_ARRAY);
return true;
}

Expand Down Expand Up @@ -1411,7 +1411,7 @@ public boolean nextFieldName(SerializableString str) throws IOException
if (!_streamReadContext.expectMoreValues()) {
_stringRefs.pop();
_streamReadContext = _streamReadContext.getParent();
_currToken = JsonToken.END_OBJECT;
_updateToken(JsonToken.END_OBJECT);
return false;
}
byte[] nameBytes = str.asQuotedUTF8();
Expand Down Expand Up @@ -1439,7 +1439,7 @@ public boolean nextFieldName(SerializableString str) throws IOException
_stringRefs.peek().stringRefs.add(strValue);
}
_streamReadContext.setCurrentName(strValue);
_currToken = JsonToken.FIELD_NAME;
_updateToken(JsonToken.FIELD_NAME);
return true;
}
if (nameBytes[i] != _inputBuffer[ptr + i]) {
Expand Down Expand Up @@ -1471,7 +1471,7 @@ public String nextFieldName() throws IOException
if (!_streamReadContext.expectMoreValues()) {
_stringRefs.pop();
_streamReadContext = _streamReadContext.getParent();
_currToken = JsonToken.END_OBJECT;
_updateToken(JsonToken.END_OBJECT);
return null;
}
// inlined "_decodeFieldName()"
Expand Down Expand Up @@ -1505,13 +1505,13 @@ public String nextFieldName() throws IOException
if (!_streamReadContext.hasExpectedLength()) {
_stringRefs.pop();
_streamReadContext = _streamReadContext.getParent();
_currToken = JsonToken.END_OBJECT;
_updateToken(JsonToken.END_OBJECT);
return null;
}
_reportUnexpectedBreak();
}
_decodeNonStringName(ch, _tagValues);
_currToken = JsonToken.FIELD_NAME;
_updateToken(JsonToken.FIELD_NAME);
return getText();
}
final int lenMarker = ch & 0x1F;
Expand Down Expand Up @@ -1552,7 +1552,7 @@ public String nextFieldName() throws IOException
_sharedString = name;
}
_streamReadContext.setCurrentName(name);
_currToken = JsonToken.FIELD_NAME;
_updateToken(JsonToken.FIELD_NAME);
return name;
}
// otherwise just fall back to default handling; should occur rarely
Expand Down
Loading

0 comments on commit 7af6e97

Please sign in to comment.