Johannes/gson-comments
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename peekedInteger to peekedLong

Browse Source
This commit is contained in:
Jesse Wilson 2012-09-02 17:46:02 +00:00
parent 8daf3aaeb4
commit 3920d95fac
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gson/src/main/java/com/google/gson/stream/JsonReader.java
View File

@ -208,8 +208,8 @@ public class JsonReader implements Closeable {
private static final int PEEKED_SINGLE_QUOTED_NAME = 12; private static final int PEEKED_SINGLE_QUOTED_NAME = 12;
private static final int PEEKED_DOUBLE_QUOTED_NAME = 13; private static final int PEEKED_DOUBLE_QUOTED_NAME = 13;
private static final int PEEKED_UNQUOTED_NAME = 14; private static final int PEEKED_UNQUOTED_NAME = 14;
/** When this is returned, the integer value is stored in peekedInteger. */ /** When this is returned, the integer value is stored in peekedLong. */
private static final int PEEKED_INTEGER = 15; private static final int PEEKED_LONG = 15;
private static final int PEEKED_NUMBER = 16; private static final int PEEKED_NUMBER = 16;
private static final int PEEKED_EOF = 17; private static final int PEEKED_EOF = 17;
@ -238,7 +238,7 @@ public class JsonReader implements Closeable {
* A peeked value that was composed entirely of digits with an optional * A peeked value that was composed entirely of digits with an optional
* leading dash. Positive values may not have a leading 0. * leading dash. Positive values may not have a leading 0.
*/ */
private long peekedInteger; private long peekedLong;
/** /**
* The number of characters in a peeked number literal. Increment 'pos' by * The number of characters in a peeked number literal. Increment 'pos' by
@ -427,7 +427,7 @@ public class JsonReader implements Closeable {
case PEEKED_UNQUOTED: case PEEKED_UNQUOTED:
case PEEKED_BUFFERED: case PEEKED_BUFFERED:
return JsonToken.STRING; return JsonToken.STRING;
case PEEKED_INTEGER: case PEEKED_LONG:
case PEEKED_NUMBER: case PEEKED_NUMBER:
return JsonToken.NUMBER; return JsonToken.NUMBER;
case PEEKED_EOF: case PEEKED_EOF:
@ -625,7 +625,7 @@ public class JsonReader implements Closeable {
} }
private int peekNumber() throws IOException { private int peekNumber() throws IOException {
long integer = 0; // Negative to accommodate Long.MIN_VALUE more easily. long value = 0; // Negative to accommodate Long.MIN_VALUE more easily.
boolean negative = false; boolean negative = false;
boolean fitsInLong = true; boolean fitsInLong = true;
int i = 0; int i = 0;
@ -641,13 +641,13 @@ public class JsonReader implements Closeable {
if (c == '0') { if (c == '0') {
c = get(++i); c = get(++i);
} else if (c >= '1' && c <= '9') { } else if (c >= '1' && c <= '9') {
integer -= (c - '0'); value -= (c - '0');
c = get(++i); c = get(++i);
while (c >= '0' && c <= '9') { while (c >= '0' && c <= '9') {
long newInteger = integer * 10 - (c - '0'); long newValue = value * 10 - (c - '0');
fitsInLong &= integer > MIN_INCOMPLETE_INTEGER fitsInLong &= value > MIN_INCOMPLETE_INTEGER
|| (integer == MIN_INCOMPLETE_INTEGER && newInteger < integer); || (value == MIN_INCOMPLETE_INTEGER && newValue < value);
integer = newInteger; value = newValue;
c = get(++i); c = get(++i);
} }
} else { } else {
@ -655,10 +655,10 @@ public class JsonReader implements Closeable {
} }
if (c == -1 || !isLiteral((char) c)) { if (c == -1 || !isLiteral((char) c)) {
if (fitsInLong && (integer != Long.MIN_VALUE || negative)) { if (fitsInLong && (value != Long.MIN_VALUE || negative)) {
peekedInteger = negative ? integer : -integer; peekedLong = negative ? value : -value;
pos += i; pos += i;
return peeked = PEEKED_INTEGER; return peeked = PEEKED_LONG;
} else { } else {
peekedNumberLength = i; peekedNumberLength = i;
return peeked = PEEKED_NUMBER; return peeked = PEEKED_NUMBER;
@ -778,8 +778,8 @@ public class JsonReader implements Closeable {
} else if (p == PEEKED_BUFFERED) { } else if (p == PEEKED_BUFFERED) {
result = peekedString; result = peekedString;
peekedString = null; peekedString = null;
} else if (p == PEEKED_INTEGER) { } else if (p == PEEKED_LONG) {
result = Long.toString(peekedInteger); result = Long.toString(peekedLong);
} else if (p == PEEKED_NUMBER) { } else if (p == PEEKED_NUMBER) {
result = new String(buffer, pos, peekedNumberLength); result = new String(buffer, pos, peekedNumberLength);
pos += peekedNumberLength; pos += peekedNumberLength;
@ -849,9 +849,9 @@ public class JsonReader implements Closeable {
p = doPeek(); p = doPeek();
} }
if (p == PEEKED_INTEGER) { if (p == PEEKED_LONG) {
peeked = PEEKED_NONE; peeked = PEEKED_NONE;
return (double) peekedInteger; return (double) peekedLong;
} }
if (p == PEEKED_NUMBER) { if (p == PEEKED_NUMBER) {
@ -893,9 +893,9 @@ public class JsonReader implements Closeable {
p = doPeek(); p = doPeek();
} }
if (p == PEEKED_INTEGER) { if (p == PEEKED_LONG) {
peeked = PEEKED_NONE; peeked = PEEKED_NONE;
return peekedInteger; return peekedLong;
} }
if (p == PEEKED_NUMBER) { if (p == PEEKED_NUMBER) {
@ -1125,10 +1125,10 @@ public class JsonReader implements Closeable {
} }
int result; int result;
if (p == PEEKED_INTEGER) { if (p == PEEKED_LONG) {
result = (int) peekedInteger; result = (int) peekedLong;
if (peekedInteger != result) { // Make sure no precision was lost casting to 'int'. if (peekedLong != result) { // Make sure no precision was lost casting to 'int'.
throw new NumberFormatException("Expected an int but was " + peekedInteger throw new NumberFormatException("Expected an int but was " + peekedLong
+ " at line " + getLineNumber() + " column " + getColumnNumber()); + " at line " + getLineNumber() + " column " + getColumnNumber());
} }
peeked = PEEKED_NONE; peeked = PEEKED_NONE;