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

Added deserialization support for Double NaN, Infinity, and -Infinity

Browse Source
This commit is contained in:
Inderjeet Singh 2008-12-19 22:21:35 +00:00
parent f33a84c223
commit 362a94ec74
5 changed files with 1914 additions and 1581 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

291
gson/src/main/java/com/google/gson/JsonParser.java
View File

@ -7,17 +7,19 @@ final class JsonParser implements JsonParserConstants {
final public JsonElement parse() throws ParseException {
JsonElement json = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 23:
case 25:
json = JsonObject();
break;
case 27:
case 29:
json = JsonArray();
break;
case DIGITS:
case NAN:
case INFINITY:
case BOOLEAN:
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
case 29:
case 31:
json = JsonPrimitive();
break;
case NULL:
@ -34,7 +36,7 @@ final class JsonParser implements JsonParserConstants {
final private JsonObject JsonObject() throws ParseException {
JsonObject o = new JsonObject();
jj_consume_token(23);
jj_consume_token(25);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
case SINGLE_QUOTE_LITERAL:
@ -45,7 +47,7 @@ final class JsonParser implements JsonParserConstants {
jj_la1[1] = jj_gen;
;
}
jj_consume_token(24);
jj_consume_token(26);
{if (true) return o;}
throw new Error("Missing return statement in function");
}
@ -53,16 +55,15 @@ final class JsonParser implements JsonParserConstants {
final private JsonNull JsonNull() throws ParseException {
Token t;
t = jj_consume_token(NULL);
{if (true)
return JsonNull.createJsonNull();}
{if (true) return JsonNull.createJsonNull();}
throw new Error("Missing return statement in function");
}
final private void Members(JsonObject o) throws ParseException {
Pair(o);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 25:
jj_consume_token(25);
case 27:
jj_consume_token(27);
Members(o);
break;
default:
@ -75,7 +76,7 @@ final class JsonParser implements JsonParserConstants {
JsonPrimitive property;
JsonElement value;
property = JsonMemberName();
jj_consume_token(26);
jj_consume_token(28);
value = JsonValue();
o.add(property.getAsString(), value);
}
@ -102,23 +103,25 @@ final class JsonParser implements JsonParserConstants {
final private JsonArray JsonArray() throws ParseException {
JsonArray array = new JsonArray();
jj_consume_token(27);
jj_consume_token(29);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DIGITS:
case NULL:
case NAN:
case INFINITY:
case BOOLEAN:
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
case 23:
case 27:
case 25:
case 29:
case 31:
Elements(array);
break;
default:
jj_la1[4] = jj_gen;
;
}
jj_consume_token(28);
jj_consume_token(30);
array.reverse();
{if (true) return array;}
throw new Error("Missing return statement in function");
@ -128,8 +131,8 @@ final class JsonParser implements JsonParserConstants {
JsonElement element;
element = JsonValue();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 25:
jj_consume_token(25);
case 27:
jj_consume_token(27);
Elements(array);
break;
default:
@ -147,13 +150,15 @@ final class JsonParser implements JsonParserConstants {
o = JsonString();
break;
case DIGITS:
case 29:
case NAN:
case INFINITY:
case 31:
o = JsonNumber();
break;
case 23:
case 25:
o = JsonObject();
break;
case 27:
case 29:
o = JsonArray();
break;
case BOOLEAN:
@ -188,7 +193,9 @@ final class JsonParser implements JsonParserConstants {
{if (true) return value;}
break;
case DIGITS:
case 29:
case NAN:
case INFINITY:
case 31:
value = JsonNumber();
{if (true) return value;}
break;
@ -208,9 +215,17 @@ final class JsonParser implements JsonParserConstants {
String intpart = null,
fracpart = null,
exppart = null;
JsonPrimitive value;
if (jj_2_1(2)) {
value = JsonSpecialNumbers();
{if (true) return value;}
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DIGITS:
case 31:
intpart = JsonInt();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 30:
case 32:
fracpart = JsonFrac();
break;
default:
@ -234,6 +249,42 @@ final class JsonParser implements JsonParserConstants {
n = new java.math.BigInteger(intpart);
}
{if (true) return new JsonPrimitive(n);}
break;
default:
jj_la1[10] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
}
throw new Error("Missing return statement in function");
}
final private JsonPrimitive JsonSpecialNumbers() throws ParseException {
boolean negative = false;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NAN:
jj_consume_token(NAN);
{if (true) return new JsonPrimitive(Double.NaN);}
break;
case INFINITY:
case 31:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 31:
jj_consume_token(31);
negative = true;
break;
default:
jj_la1[11] = jj_gen;
;
}
jj_consume_token(INFINITY);
{if (true) return new JsonPrimitive(negative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY);}
break;
default:
jj_la1[12] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
@ -241,12 +292,12 @@ final class JsonParser implements JsonParserConstants {
String digits;
boolean negative = false;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 29:
jj_consume_token(29);
case 31:
jj_consume_token(31);
negative = true;
break;
default:
jj_la1[10] = jj_gen;
jj_la1[13] = jj_gen;
;
}
digits = Digits();
@ -258,7 +309,7 @@ final class JsonParser implements JsonParserConstants {
final private String JsonFrac() throws ParseException {
String digits;
jj_consume_token(30);
jj_consume_token(32);
digits = Digits();
{if (true) return "." + digits;}
throw new Error("Missing return statement in function");
@ -290,7 +341,7 @@ final class JsonParser implements JsonParserConstants {
t = jj_consume_token(DOUBLE_QUOTE_LITERAL);
break;
default:
jj_la1[11] = jj_gen;
jj_la1[14] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@ -299,19 +350,71 @@ final class JsonParser implements JsonParserConstants {
throw new Error("Missing return statement in function");
}
final private boolean jj_2_1(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_1(); }
catch(LookaheadSuccess ls) { return true; }
finally { jj_save(0, xla); }
}
final private boolean jj_3R_4() {
if (jj_scan_token(31)) return true;
return false;
}
final private boolean jj_3R_3() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_4()) jj_scanpos = xsp;
if (jj_scan_token(INFINITY)) return true;
return false;
}
final private boolean jj_3_1() {
if (jj_3R_1()) return true;
return false;
}
final private boolean jj_3R_2() {
if (jj_scan_token(NAN)) return true;
return false;
}
final private boolean jj_3R_1() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_2()) {
jj_scanpos = xsp;
if (jj_3R_3()) return true;
}
return false;
}
public JsonParserTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
private int jj_ntk;
private Token jj_scanpos, jj_lastpos;
private int jj_la;
public boolean lookingAhead = false;
private boolean jj_semLA;
private int jj_gen;
final private int[] jj_la1 = new int[12];
final private int[] jj_la1 = new int[15];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static {
jj_la1_0();
jj_la1_1();
}
private static void jj_la1_0() {
jj_la1_0 = new int[] {0x288061c0,0x6200,0x2000000,0x6200,0x288061c0,0x2000000,0x288061c0,0x20006140,0x40000000,0x20,0x20000000,0x6000,};
jj_la1_0 = new int[] {0xa20187c0,0x18800,0x8000000,0x18800,0xa20187c0,0x8000000,0xa20187c0,0x80018740,0x0,0x20,0x80000040,0x80000000,0x80000300,0x80000000,0x18000,};
}
private static void jj_la1_1() {
jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[1];
private boolean jj_rescan = false;
private int jj_gc = 0;
public JsonParser(java.io.InputStream stream) {
this(stream, null);
@ -322,7 +425,8 @@ final class JsonParser implements JsonParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
for (int i = 0; i < 15; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
public void ReInit(java.io.InputStream stream) {
@ -334,7 +438,8 @@ final class JsonParser implements JsonParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
for (int i = 0; i < 15; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
public JsonParser(java.io.Reader stream) {
@ -343,7 +448,8 @@ final class JsonParser implements JsonParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
for (int i = 0; i < 15; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
public void ReInit(java.io.Reader stream) {
@ -352,7 +458,8 @@ final class JsonParser implements JsonParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
for (int i = 0; i < 15; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
public JsonParser(JsonParserTokenManager tm) {
@ -360,7 +467,8 @@ final class JsonParser implements JsonParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
for (int i = 0; i < 15; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
public void ReInit(JsonParserTokenManager tm) {
@ -368,7 +476,8 @@ final class JsonParser implements JsonParserConstants {
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
for (int i = 0; i < 15; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
final private Token jj_consume_token(int kind) throws ParseException {
@ -378,6 +487,16 @@ final class JsonParser implements JsonParserConstants {
jj_ntk = -1;
if (token.kind == kind) {
jj_gen++;
if (++jj_gc > 100) {
jj_gc = 0;
for (int i = 0; i < jj_2_rtns.length; i++) {
JJCalls c = jj_2_rtns[i];
while (c != null) {
if (c.gen < jj_gen) c.first = null;
c = c.next;
}
}
}
return token;
}
token = oldToken;
@ -385,6 +504,29 @@ final class JsonParser implements JsonParserConstants {
throw generateParseException();
}
static private final class LookaheadSuccess extends java.lang.Error { }
final private LookaheadSuccess jj_ls = new LookaheadSuccess();
final private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) {
jj_la--;
if (jj_scanpos.next == null) {
jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
} else {
jj_lastpos = jj_scanpos = jj_scanpos.next;
}
} else {
jj_scanpos = jj_scanpos.next;
}
if (jj_rescan) {
int i = 0; Token tok = token;
while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
if (tok != null) jj_add_error_token(kind, i);
}
if (jj_scanpos.kind != kind) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
return false;
}
final public Token getNextToken() {
if (token.next != null) token = token.next;
else token = token.next = token_source.getNextToken();
@ -394,7 +536,7 @@ final class JsonParser implements JsonParserConstants {
}
final public Token getToken(int index) {
Token t = token;
Token t = lookingAhead ? jj_scanpos : token;
for (int i = 0; i < index; i++) {
if (t.next != null) t = t.next;
else t = t.next = token_source.getNextToken();
@ -412,33 +554,69 @@ final class JsonParser implements JsonParserConstants {
private java.util.Vector jj_expentries = new java.util.Vector();
private int[] jj_expentry;
private int jj_kind = -1;
private int[] jj_lasttokens = new int[100];
private int jj_endpos;
private void jj_add_error_token(int kind, int pos) {
if (pos >= 100) return;
if (pos == jj_endpos + 1) {
jj_lasttokens[jj_endpos++] = kind;
} else if (jj_endpos != 0) {
jj_expentry = new int[jj_endpos];
for (int i = 0; i < jj_endpos; i++) {
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
for (java.util.Enumeration e = jj_expentries.elements(); e.hasMoreElements();) {
int[] oldentry = (int[])(e.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
if (oldentry[i] != jj_expentry[i]) {
exists = false;
break;
}
}
if (exists) break;
}
}
if (!exists) jj_expentries.addElement(jj_expentry);
if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
}
}
public ParseException generateParseException() {
jj_expentries.removeAllElements();
boolean[] la1tokens = new boolean[31];
for (int i = 0; i < 31; i++) {
boolean[] la1tokens = new boolean[33];
for (int i = 0; i < 33; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
for (int i = 0; i < 12; i++) {
for (int i = 0; i < 15; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
la1tokens[j] = true;
}
if ((jj_la1_1[i] & (1<<j)) != 0) {
la1tokens[32+j] = true;
}
}
}
for (int i = 0; i < 31; i++) {
}
for (int i = 0; i < 33; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
jj_expentries.addElement(jj_expentry);
}
}
jj_endpos = 0;
jj_rescan_token();
jj_add_error_token(0, 0);
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
exptokseq[i] = (int[])jj_expentries.elementAt(i);
@ -452,4 +630,39 @@ final class JsonParser implements JsonParserConstants {
final public void disable_tracing() {
}
final private void jj_rescan_token() {
jj_rescan = true;
for (int i = 0; i < 1; i++) {
try {
JJCalls p = jj_2_rtns[i];
do {
if (p.gen > jj_gen) {
jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
switch (i) {
case 0: jj_3_1(); break;
}
}
p = p.next;
} while (p != null);
} catch(LookaheadSuccess ls) { }
}
jj_rescan = false;
}
final private void jj_save(int index, int xla) {
JJCalls p = jj_2_rtns[index];
while (p.gen > jj_gen) {
if (p.next == null) { p = p.next = new JJCalls(); break; }
p = p.next;
}
p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
}
static final class JJCalls {
int gen;
Token first;
int arg;
JJCalls next;
}
}

30
gson/src/main/java/com/google/gson/JsonParserConstants.java
View File

@ -8,19 +8,21 @@ interface JsonParserConstants {
int E = 5;
int DIGITS = 6;
int NULL = 7;
int BOOLEAN = 8;
int IDENTIFIER = 9;
int HEX_CHAR = 10;
int UNICODE_CHAR = 11;
int ESCAPE_CHAR = 12;
int SINGLE_QUOTE_LITERAL = 13;
int DOUBLE_QUOTE_LITERAL = 14;
int QUOTE = 15;
int ENDQUOTE = 17;
int CHAR = 18;
int CNTRL_ESC = 19;
int HEX = 21;
int HEX_ESC = 22;
int NAN = 8;
int INFINITY = 9;
int BOOLEAN = 10;
int IDENTIFIER = 11;
int HEX_CHAR = 12;
int UNICODE_CHAR = 13;
int ESCAPE_CHAR = 14;
int SINGLE_QUOTE_LITERAL = 15;
int DOUBLE_QUOTE_LITERAL = 16;
int QUOTE = 17;
int ENDQUOTE = 19;
int CHAR = 20;
int CNTRL_ESC = 21;
int HEX = 23;
int HEX_ESC = 24;
int DEFAULT = 0;
int STRING_STATE = 1;
@ -36,6 +38,8 @@ interface JsonParserConstants {
"<E>",
"<DIGITS>",
"\"null\"",
"\"NaN\"",
"\"Infinity\"",
"<BOOLEAN>",
"<IDENTIFIER>",
"<HEX_CHAR>",

248
gson/src/main/java/com/google/gson/JsonParserTokenManager.java
View File

@ -72,8 +72,8 @@ private final int jjMoveNfa_3(int startState, int curPos)
jjstateSet[jjnewStateCnt++] = 3;
break;
case 3:
if ((0x3ff000000000000L & l) != 0L && kind > 22)
kind = 22;
if ((0x3ff000000000000L & l) != 0L && kind > 24)
kind = 24;
break;
default : break;
}
@ -99,8 +99,8 @@ private final int jjMoveNfa_3(int startState, int curPos)
jjstateSet[jjnewStateCnt++] = 3;
break;
case 3:
if ((0x7e0000007eL & l) != 0L && kind > 22)
kind = 22;
if ((0x7e0000007eL & l) != 0L && kind > 24)
kind = 24;
break;
default : break;
}
@ -139,30 +139,66 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0)
switch (pos)
{
case 0:
if ((active0 & 0x8000L) != 0L)
return 41;
if ((active0 & 0x80L) != 0L)
if ((active0 & 0x380L) != 0L)
{
jjmatchedKind = 9;
jjmatchedKind = 11;
return 12;
}
if ((active0 & 0x20000L) != 0L)
return 41;
return -1;
case 1:
if ((active0 & 0x80L) != 0L)
if ((active0 & 0x380L) != 0L)
{
jjmatchedKind = 9;
jjmatchedKind = 11;
jjmatchedPos = 1;
return 12;
}
return -1;
case 2:
if ((active0 & 0x80L) != 0L)
if ((active0 & 0x100L) != 0L)
return 12;
if ((active0 & 0x280L) != 0L)
{
jjmatchedKind = 9;
jjmatchedKind = 11;
jjmatchedPos = 2;
return 12;
}
return -1;
case 3:
if ((active0 & 0x80L) != 0L)
return 12;
if ((active0 & 0x200L) != 0L)
{
jjmatchedKind = 11;
jjmatchedPos = 3;
return 12;
}
return -1;
case 4:
if ((active0 & 0x200L) != 0L)
{
jjmatchedKind = 11;
jjmatchedPos = 4;
return 12;
}
return -1;
case 5:
if ((active0 & 0x200L) != 0L)
{
jjmatchedKind = 11;
jjmatchedPos = 5;
return 12;
}
return -1;
case 6:
if ((active0 & 0x200L) != 0L)
{
jjmatchedKind = 11;
jjmatchedPos = 6;
return 12;
}
return -1;
default :
return -1;
}
@ -190,25 +226,29 @@ private final int jjMoveStringLiteralDfa0_0()
switch(curChar)
{
case 34:
return jjStartNfaWithStates_0(0, 15, 41);
return jjStartNfaWithStates_0(0, 17, 41);
case 44:
return jjStopAtPos(0, 25);
case 45:
return jjStopAtPos(0, 29);
case 46:
return jjStopAtPos(0, 30);
case 58:
return jjStopAtPos(0, 26);
case 91:
return jjStopAtPos(0, 27);
case 93:
case 45:
return jjStopAtPos(0, 31);
case 46:
return jjStopAtPos(0, 32);
case 58:
return jjStopAtPos(0, 28);
case 73:
return jjMoveStringLiteralDfa1_0(0x200L);
case 78:
return jjMoveStringLiteralDfa1_0(0x100L);
case 91:
return jjStopAtPos(0, 29);
case 93:
return jjStopAtPos(0, 30);
case 110:
return jjMoveStringLiteralDfa1_0(0x80L);
case 123:
return jjStopAtPos(0, 23);
return jjStopAtPos(0, 25);
case 125:
return jjStopAtPos(0, 24);
return jjStopAtPos(0, 26);
default :
return jjMoveNfa_0(0, 0);
}
@ -222,6 +262,10 @@ private final int jjMoveStringLiteralDfa1_0(long active0)
}
switch(curChar)
{
case 97:
return jjMoveStringLiteralDfa2_0(active0, 0x100L);
case 110:
return jjMoveStringLiteralDfa2_0(active0, 0x200L);
case 117:
return jjMoveStringLiteralDfa2_0(active0, 0x80L);
default :
@ -240,6 +284,12 @@ private final int jjMoveStringLiteralDfa2_0(long old0, long active0)
}
switch(curChar)
{
case 78:
if ((active0 & 0x100L) != 0L)
return jjStartNfaWithStates_0(2, 8, 12);
break;
case 102:
return jjMoveStringLiteralDfa3_0(active0, 0x200L);
case 108:
return jjMoveStringLiteralDfa3_0(active0, 0x80L);
default :
@ -258,6 +308,8 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
}
switch(curChar)
{
case 105:
return jjMoveStringLiteralDfa4_0(active0, 0x200L);
case 108:
if ((active0 & 0x80L) != 0L)
return jjStartNfaWithStates_0(3, 7, 12);
@ -267,6 +319,80 @@ private final int jjMoveStringLiteralDfa3_0(long old0, long active0)
}
return jjStartNfa_0(2, active0);
}
private final int jjMoveStringLiteralDfa4_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(2, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(3, active0);
return 4;
}
switch(curChar)
{
case 110:
return jjMoveStringLiteralDfa5_0(active0, 0x200L);
default :
break;
}
return jjStartNfa_0(3, active0);
}
private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(3, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(4, active0);
return 5;
}
switch(curChar)
{
case 105:
return jjMoveStringLiteralDfa6_0(active0, 0x200L);
default :
break;
}
return jjStartNfa_0(4, active0);
}
private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(4, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(5, active0);
return 6;
}
switch(curChar)
{
case 116:
return jjMoveStringLiteralDfa7_0(active0, 0x200L);
default :
break;
}
return jjStartNfa_0(5, active0);
}
private final int jjMoveStringLiteralDfa7_0(long old0, long active0)
{
if (((active0 &= old0)) == 0L)
return jjStartNfa_0(5, old0);
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(6, active0);
return 7;
}
switch(curChar)
{
case 121:
if ((active0 & 0x200L) != 0L)
return jjStartNfaWithStates_0(7, 9, 12);
break;
default :
break;
}
return jjStartNfa_0(6, active0);
}
static final long[] jjbitVec0 = {
0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
};
@ -297,8 +423,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
jjCheckNAddStates(0, 3);
else if (curChar == 34)
{
if (kind > 14)
kind = 14;
if (kind > 16)
kind = 16;
}
break;
case 0:
@ -327,8 +453,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
case 12:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 9)
kind = 9;
if (kind > 11)
kind = 11;
jjstateSet[jjnewStateCnt++] = 12;
break;
case 14:
@ -344,8 +470,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
jjstateSet[jjnewStateCnt++] = 17;
break;
case 17:
if ((0x3ff000000000000L & l) != 0L && kind > 11)
kind = 11;
if ((0x3ff000000000000L & l) != 0L && kind > 13)
kind = 13;
break;
case 19:
if (curChar == 39)
@ -376,8 +502,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
jjCheckNAddStates(4, 7);
break;
case 29:
if (curChar == 39 && kind > 13)
kind = 13;
if (curChar == 39 && kind > 15)
kind = 15;
break;
case 30:
if (curChar == 34)
@ -408,8 +534,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
jjCheckNAddStates(0, 3);
break;
case 40:
if (curChar == 34 && kind > 14)
kind = 14;
if (curChar == 34 && kind > 16)
kind = 16;
break;
default : break;
}
@ -433,8 +559,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
case 0:
if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 9)
kind = 9;
if (kind > 11)
kind = 11;
jjCheckNAdd(12);
}
else if (curChar == 92)
@ -451,8 +577,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
jjstateSet[jjnewStateCnt++] = 5;
break;
case 3:
if (curChar == 101 && kind > 8)
kind = 8;
if (curChar == 101 && kind > 10)
kind = 10;
break;
case 4:
if (curChar == 117)
@ -486,8 +612,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
case 12:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 9)
kind = 9;
if (kind > 11)
kind = 11;
jjCheckNAdd(12);
break;
case 13:
@ -507,8 +633,8 @@ private final int jjMoveNfa_0(int startState, int curPos)
jjstateSet[jjnewStateCnt++] = 17;
break;
case 17:
if ((0x7e0000007eL & l) != 0L && kind > 11)
kind = 11;
if ((0x7e0000007eL & l) != 0L && kind > 13)
kind = 13;
break;
case 18:
if (curChar == 92)
@ -652,7 +778,7 @@ private final int jjMoveStringLiteralDfa0_2()
switch(curChar)
{
case 117:
return jjStopAtPos(0, 20);
return jjStopAtPos(0, 22);
default :
return jjMoveNfa_2(0, 0);
}
@ -678,7 +804,7 @@ private final int jjMoveNfa_2(int startState, int curPos)
{
case 0:
if ((0x800400000000L & l) != 0L)
kind = 19;
kind = 21;
break;
default : break;
}
@ -693,7 +819,7 @@ private final int jjMoveNfa_2(int startState, int curPos)
{
case 0:
if ((0x14404410000000L & l) != 0L)
kind = 19;
kind = 21;
break;
default : break;
}
@ -752,7 +878,7 @@ private final int jjMoveStringLiteralDfa0_1()
switch(curChar)
{
case 92:
return jjStopAtPos(0, 16);
return jjStopAtPos(0, 18);
default :
return jjMoveNfa_1(0, 0);
}
@ -779,18 +905,18 @@ private final int jjMoveNfa_1(int startState, int curPos)
case 0:
if ((0xfffffffbffffffffL & l) != 0L)
{
if (kind > 18)
kind = 18;
if (kind > 20)
kind = 20;
}
else if (curChar == 34)
{
if (kind > 17)
kind = 17;
if (kind > 19)
kind = 19;
}
break;
case 1:
if ((0xfffffffbffffffffL & l) != 0L)
kind = 18;
kind = 20;
break;
default : break;
}
@ -805,7 +931,7 @@ private final int jjMoveNfa_1(int startState, int curPos)
{
case 0:
if ((0xffffffffefffffffL & l) != 0L)
kind = 18;
kind = 20;
break;
default : break;
}
@ -823,8 +949,8 @@ private final int jjMoveNfa_1(int startState, int curPos)
switch(jjstateSet[--i])
{
case 0:
if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
kind = 18;
if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 20)
kind = 20;
break;
default : break;
}
@ -859,9 +985,9 @@ private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, lo
}
}
public static final String[] jjstrLiteralImages = {
"", null, null, null, null, null, null, "\156\165\154\154", null, null, null,
null, null, null, null, "\42", null, null, null, null, null, null, null, "\173",
"\175", "\54", "\72", "\133", "\135", "\55", "\56", };
"", null, null, null, null, null, null, "\156\165\154\154", "\116\141\116",
"\111\156\146\151\156\151\164\171", null, null, null, null, null, null, null, "\42", null, null, null, null, null,
null, null, "\173", "\175", "\54", "\72", "\133", "\135", "\55", "\56", };
public static final String[] lexStateNames = {
"DEFAULT",
"STRING_STATE",
@ -869,17 +995,17 @@ public static final String[] lexStateNames = {
"HEX_STATE",
};
public static final int[] jjnewLexState = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 2, 0, -1, 1, 3, -1, 1, -1, -1,
-1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 2, 0, -1, 1, 3, -1, 1,
-1, -1, -1, -1, -1, -1, -1, -1,
};
static final long[] jjtoToken = {
0x7fceebe1L,
0x1ff3bafe1L,
};
static final long[] jjtoSkip = {
0x1eL,
};
static final long[] jjtoMore = {
0x110000L,
0x440000L,
};
protected SimpleCharStream input_stream;
private final int[] jjrounds = new int[41];

16
gson/src/main/javacc/JsonParser.jj
View File

@ -29,6 +29,8 @@ TOKEN : {
<E : ["e","E"](["+","-"])?>
| <DIGITS : (["0"-"9"])+>
| <NULL : "null">
| <NAN : "NaN">
| <INFINITY : "Infinity">
| <BOOLEAN : ("true" | "false")>
| <IDENTIFIER : ["a"-"z","A"-"Z", "_"] (["a"-"z","A"-"Z","0"-"9","_"])* >
| <#HEX_CHAR : ["a"-"f","A"-"F","0"-"9"]>
@ -161,9 +163,12 @@ private JsonPrimitive JsonNumber() :
String intpart = null,
fracpart = null,
exppart = null;
JsonPrimitive value;
}
{
intpart=JsonInt() [ fracpart=JsonFrac() ] [ exppart=JsonExp() ]
LOOKAHEAD(2)
(value=JsonSpecialNumbers()) {return value; } |
(intpart=JsonInt() [ fracpart=JsonFrac() ] [ exppart=JsonExp() ])
{
Number n;
if (exppart != null || fracpart != null) {
@ -177,6 +182,15 @@ private JsonPrimitive JsonNumber() :
}
}
private JsonPrimitive JsonSpecialNumbers() :
{
boolean negative = false;
}
{
(<NAN>) {return new JsonPrimitive(Double.NaN); } |
(["-" {negative = true;}]<INFINITY>) {return new JsonPrimitive(negative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY); }
}
private String JsonInt() :
{
String digits;

48
gson/src/test/java/com/google/gson/functional/PrimitiveTest.java
View File

@ -360,12 +360,8 @@ public class PrimitiveTest extends TestCase {
}
public void testDoubleNaNDeserializationNotSupported() {
try {
gson.fromJson("NaN", Double.class);
gson.fromJson("NaN", double.class);
fail("Gson should not accept NaN for deserialization");
} catch (JsonParseException expected) {
}
assertTrue(Double.isNaN(gson.fromJson("NaN", Double.class)));
assertTrue(Double.isNaN(gson.fromJson("NaN", double.class)));
}
public void testFloatNaNSerializationNotSupported() {
float nan = (float) Float.NaN;
@ -378,12 +374,8 @@ public class PrimitiveTest extends TestCase {
}
public void testFloatNaNDeserializationNotSupported() {
try {
gson.fromJson("NaN", Float.class);
gson.fromJson("NaN", float.class);
fail("Gson should not accept NaN for deserialization");
} catch (JsonParseException expected) {
}
assertTrue(Float.isNaN(gson.fromJson("NaN", Float.class)));
assertTrue(Float.isNaN(gson.fromJson("NaN", float.class)));
}
public void testBigDecimalNaNDeserializationNotSupported() {
@ -405,12 +397,8 @@ public class PrimitiveTest extends TestCase {
}
public void testDoubleInfinityDeserializationNotSupported() {
try {
gson.fromJson("Infinity", Double.class);
gson.fromJson("Infinity", double.class);
fail("Gson should not accept positive infinity for deserialization");
} catch (JsonParseException expected) {
}
assertTrue(Double.isInfinite(gson.fromJson("Infinity", Double.class)));
assertTrue(Double.isInfinite(gson.fromJson("Infinity", double.class)));
}
public void testFloatInfinitySerializationNotSupported() {
@ -424,12 +412,8 @@ public class PrimitiveTest extends TestCase {
}
public void testFloatInfinityDeserializationNotSupported() {
try {
gson.fromJson("Infinity", Float.class);
gson.fromJson("Infinity", float.class);
fail("Gson should not accept positive infinity for deserialization");
} catch (JsonParseException expected) {
}
assertTrue(Float.isInfinite(gson.fromJson("Infinity", Float.class)));
assertTrue(Float.isInfinite(gson.fromJson("Infinity", float.class)));
}
public void testBigDecimalInfinityDeserializationNotSupported() {
@ -451,12 +435,8 @@ public class PrimitiveTest extends TestCase {
}
public void testNegativeInfinityDeserializationNotSupported() {
try {
gson.fromJson("-Infinity", double.class);
gson.fromJson("-Infinity", Double.class);
fail("Gson should not accept positive infinity for deserialization");
} catch (JsonParseException expected) {
}
assertTrue(Double.isInfinite(gson.fromJson("-Infinity", double.class)));
assertTrue(Double.isInfinite(gson.fromJson("-Infinity", Double.class)));
}
public void testNegativeInfinityFloatSerializationNotSupported() {
@ -470,12 +450,8 @@ public class PrimitiveTest extends TestCase {
}
public void testNegativeInfinityFloatDeserializationNotSupported() {
try {
gson.fromJson("-Infinity", float.class);
gson.fromJson("-Infinity", Float.class);
fail("Gson should not accept positive infinity for deserialization");
} catch (JsonParseException expected) {
}
assertTrue(Float.isInfinite(gson.fromJson("-Infinity", float.class)));
assertTrue(Float.isInfinite(gson.fromJson("-Infinity", Float.class)));
}
public void testNegativeInfinityBigDecimalDeserializationNotSupported() {