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

Updated Gson grammar to support floating point numbers without a +/- after the E. So, 1.234567899E8 is now accepted by Gson as a valid floating point number. This fixed the bug http://code.google.com/p/google-gson/issues/detail?id=94

Browse Source 
Also, updated Gson to use Javacc 4.2.
This commit is contained in:
Inderjeet Singh 2009-03-05 23:05:29 +00:00
parent 18005bbae1
commit 16be7167ec
6 changed files with 522 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gson/pom.xml
View File

@ -138,10 +138,10 @@
<dependency> <dependency>
<groupId>net.java.dev.javacc</groupId> <groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId> <artifactId>javacc</artifactId>
<version>4.0</version> <version>4.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin --> </plugin-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>

194
gson/src/main/java/com/google/gson/JsonParserImpl.java
View File

@ -7,10 +7,10 @@ final class JsonParserImpl implements JsonParserImplConstants {
final public JsonElement parse() throws ParseException { final public JsonElement parse() throws ParseException {
JsonElement json = null; JsonElement json = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 25: case 26:
json = JsonObject(); json = JsonObject();
break; break;
case 29: case 30:
json = JsonArray(); json = JsonArray();
break; break;
case DIGITS: case DIGITS:
@ -19,7 +19,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
case BOOLEAN: case BOOLEAN:
case SINGLE_QUOTE_LITERAL: case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL: case DOUBLE_QUOTE_LITERAL:
case 31: case 32:
json = JsonPrimitive(); json = JsonPrimitive();
break; break;
case NULL: case NULL:
@ -36,9 +36,10 @@ final class JsonParserImpl implements JsonParserImplConstants {
final private JsonObject JsonObject() throws ParseException { final private JsonObject JsonObject() throws ParseException {
JsonObject o = new JsonObject(); JsonObject o = new JsonObject();
jj_consume_token(25); jj_consume_token(26);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER: case IDENTIFIER_SANS_EXPONENT:
case IDENTIFIER_STARTS_WITH_EXPONENT:
case SINGLE_QUOTE_LITERAL: case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL: case DOUBLE_QUOTE_LITERAL:
Members(o); Members(o);
@ -47,7 +48,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
jj_la1[1] = jj_gen; jj_la1[1] = jj_gen;
; ;
} }
jj_consume_token(26); jj_consume_token(27);
{if (true) return o;} {if (true) return o;}
throw new Error("Missing return statement in function"); throw new Error("Missing return statement in function");
} }
@ -62,8 +63,8 @@ final class JsonParserImpl implements JsonParserImplConstants {
final private void Members(JsonObject o) throws ParseException { final private void Members(JsonObject o) throws ParseException {
Pair(o); Pair(o);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 27: case 28:
jj_consume_token(27); jj_consume_token(28);
Members(o); Members(o);
break; break;
default: default:
@ -76,7 +77,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
JsonPrimitive property; JsonPrimitive property;
JsonElement value; JsonElement value;
property = JsonMemberName(); property = JsonMemberName();
jj_consume_token(28); jj_consume_token(29);
value = JsonValue(); value = JsonValue();
o.add(property.getAsString(), value); o.add(property.getAsString(), value);
} }
@ -84,8 +85,9 @@ final class JsonParserImpl implements JsonParserImplConstants {
final private JsonPrimitive JsonMemberName() throws ParseException { final private JsonPrimitive JsonMemberName() throws ParseException {
Token t; JsonPrimitive value; Token t; JsonPrimitive value;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER: case IDENTIFIER_SANS_EXPONENT:
t = jj_consume_token(IDENTIFIER); case IDENTIFIER_STARTS_WITH_EXPONENT:
t = Identifier();
{if (true) return new JsonPrimitive(t.image);} {if (true) return new JsonPrimitive(t.image);}
break; break;
case SINGLE_QUOTE_LITERAL: case SINGLE_QUOTE_LITERAL:
@ -103,7 +105,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
final private JsonArray JsonArray() throws ParseException { final private JsonArray JsonArray() throws ParseException {
JsonArray array = new JsonArray(); JsonArray array = new JsonArray();
jj_consume_token(29); jj_consume_token(30);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DIGITS: case DIGITS:
case NULL: case NULL:
@ -112,16 +114,16 @@ final class JsonParserImpl implements JsonParserImplConstants {
case BOOLEAN: case BOOLEAN:
case SINGLE_QUOTE_LITERAL: case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL: case DOUBLE_QUOTE_LITERAL:
case 25: case 26:
case 29: case 30:
case 31: case 32:
Elements(array); Elements(array);
break; break;
default: default:
jj_la1[4] = jj_gen; jj_la1[4] = jj_gen;
; ;
} }
jj_consume_token(30); jj_consume_token(31);
array.reverse(); array.reverse();
{if (true) return array;} {if (true) return array;}
throw new Error("Missing return statement in function"); throw new Error("Missing return statement in function");
@ -131,8 +133,8 @@ final class JsonParserImpl implements JsonParserImplConstants {
JsonElement element; JsonElement element;
element = JsonValue(); element = JsonValue();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 27: case 28:
jj_consume_token(27); jj_consume_token(28);
Elements(array); Elements(array);
break; break;
default: default:
@ -152,13 +154,13 @@ final class JsonParserImpl implements JsonParserImplConstants {
case DIGITS: case DIGITS:
case NAN: case NAN:
case INFINITY: case INFINITY:
case 31: case 32:
o = JsonNumber(); o = JsonNumber();
break; break;
case 25: case 26:
o = JsonObject(); o = JsonObject();
break; break;
case 29: case 30:
o = JsonArray(); o = JsonArray();
break; break;
case BOOLEAN: case BOOLEAN:
@ -195,7 +197,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
case DIGITS: case DIGITS:
case NAN: case NAN:
case INFINITY: case INFINITY:
case 31: case 32:
value = JsonNumber(); value = JsonNumber();
{if (true) return value;} {if (true) return value;}
break; break;
@ -222,10 +224,10 @@ final class JsonParserImpl implements JsonParserImplConstants {
} else { } else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DIGITS: case DIGITS:
case 31: case 32:
intpart = JsonInt(); intpart = JsonInt();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 32: case 33:
fracpart = JsonFrac(); fracpart = JsonFrac();
break; break;
default: default:
@ -233,7 +235,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
; ;
} }
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case E: case EXPONENT:
exppart = JsonExp(); exppart = JsonExp();
break; break;
default: default:
@ -267,10 +269,10 @@ final class JsonParserImpl implements JsonParserImplConstants {
{if (true) return new JsonPrimitive(Double.NaN);} {if (true) return new JsonPrimitive(Double.NaN);}
break; break;
case INFINITY: case INFINITY:
case 31: case 32:
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 31: case 32:
jj_consume_token(31); jj_consume_token(32);
negative = true; negative = true;
break; break;
default: default:
@ -292,8 +294,8 @@ final class JsonParserImpl implements JsonParserImplConstants {
String digits; String digits;
boolean negative = false; boolean negative = false;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 31: case 32:
jj_consume_token(31); jj_consume_token(32);
negative = true; negative = true;
break; break;
default: default:
@ -309,7 +311,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
final private String JsonFrac() throws ParseException { final private String JsonFrac() throws ParseException {
String digits; String digits;
jj_consume_token(32); jj_consume_token(33);
digits = Digits(); digits = Digits();
{if (true) return "." + digits;} {if (true) return "." + digits;}
throw new Error("Missing return statement in function"); throw new Error("Missing return statement in function");
@ -317,10 +319,26 @@ final class JsonParserImpl implements JsonParserImplConstants {
final private String JsonExp() throws ParseException { final private String JsonExp() throws ParseException {
Token t; Token t;
String digits; t = jj_consume_token(EXPONENT);
t = jj_consume_token(E); {if (true) return t.image;}
digits = Digits(); throw new Error("Missing return statement in function");
{if (true) return t.image + digits;} }
final private Token Identifier() throws ParseException {
Token t;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER_STARTS_WITH_EXPONENT:
t = jj_consume_token(IDENTIFIER_STARTS_WITH_EXPONENT);
break;
case IDENTIFIER_SANS_EXPONENT:
t = jj_consume_token(IDENTIFIER_SANS_EXPONENT);
break;
default:
jj_la1[14] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
{if (true) return t;}
throw new Error("Missing return statement in function"); throw new Error("Missing return statement in function");
} }
@ -341,7 +359,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
t = jj_consume_token(DOUBLE_QUOTE_LITERAL); t = jj_consume_token(DOUBLE_QUOTE_LITERAL);
break; break;
default: default:
jj_la1[14] = jj_gen; jj_la1[15] = jj_gen;
jj_consume_token(-1); jj_consume_token(-1);
throw new ParseException(); throw new ParseException();
} }
@ -350,19 +368,19 @@ final class JsonParserImpl implements JsonParserImplConstants {
throw new Error("Missing return statement in function"); throw new Error("Missing return statement in function");
} }
final private boolean jj_2_1(int xla) { private boolean jj_2_1(int xla) {
jj_la = xla; jj_lastpos = jj_scanpos = token; jj_la = xla; jj_lastpos = jj_scanpos = token;
try { return !jj_3_1(); } try { return !jj_3_1(); }
catch(LookaheadSuccess ls) { return true; } catch(LookaheadSuccess ls) { return true; }
finally { jj_save(0, xla); } finally { jj_save(0, xla); }
} }
final private boolean jj_3R_4() { private boolean jj_3R_4() {
if (jj_scan_token(31)) return true; if (jj_scan_token(32)) return true;
return false; return false;
} }
final private boolean jj_3R_3() { private boolean jj_3R_3() {
Token xsp; Token xsp;
xsp = jj_scanpos; xsp = jj_scanpos;
if (jj_3R_4()) jj_scanpos = xsp; if (jj_3R_4()) jj_scanpos = xsp;
@ -370,17 +388,17 @@ final class JsonParserImpl implements JsonParserImplConstants {
return false; return false;
} }
final private boolean jj_3_1() { private boolean jj_3_1() {
if (jj_3R_1()) return true; if (jj_3R_1()) return true;
return false; return false;
} }
final private boolean jj_3R_2() { private boolean jj_3R_2() {
if (jj_scan_token(NAN)) return true; if (jj_scan_token(NAN)) return true;
return false; return false;
} }
final private boolean jj_3R_1() { private boolean jj_3R_1() {
Token xsp; Token xsp;
xsp = jj_scanpos; xsp = jj_scanpos;
if (jj_3R_2()) { if (jj_3R_2()) {
@ -390,97 +408,107 @@ final class JsonParserImpl implements JsonParserImplConstants {
return false; return false;
} }
/** Generated Token Manager. */
public JsonParserImplTokenManager token_source; public JsonParserImplTokenManager token_source;
SimpleCharStream jj_input_stream; SimpleCharStream jj_input_stream;
public Token token, jj_nt; /** Current token. */
public Token token;
/** Next token. */
public Token jj_nt;
private int jj_ntk; private int jj_ntk;
private Token jj_scanpos, jj_lastpos; private Token jj_scanpos, jj_lastpos;
private int jj_la; private int jj_la;
public boolean lookingAhead = false;
private boolean jj_semLA;
private int jj_gen; private int jj_gen;
final private int[] jj_la1 = new int[15]; final private int[] jj_la1 = new int[16];
static private int[] jj_la1_0; static private int[] jj_la1_0;
static private int[] jj_la1_1; static private int[] jj_la1_1;
static { static {
jj_la1_0(); jj_la1_init_0();
jj_la1_1(); jj_la1_init_1();
} }
private static void jj_la1_0() { private static void jj_la1_init_0() {
jj_la1_0 = new int[] {0xa20187c0,0x18800,0x8000000,0x18800,0xa20187c0,0x8000000,0xa20187c0,0x80018740,0x0,0x20,0x80000040,0x80000000,0x80000300,0x80000000,0x18000,}; jj_la1_0 = new int[] {0x440307c0,0x31800,0x10000000,0x31800,0x440307c0,0x10000000,0x440307c0,0x30740,0x0,0x20,0x40,0x0,0x300,0x0,0x1800,0x30000,};
} }
private static void jj_la1_1() { private static void jj_la1_init_1() {
jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,}; jj_la1_1 = new int[] {0x1,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x2,0x0,0x1,0x1,0x1,0x1,0x0,0x0,};
} }
final private JJCalls[] jj_2_rtns = new JJCalls[1]; final private JJCalls[] jj_2_rtns = new JJCalls[1];
private boolean jj_rescan = false; private boolean jj_rescan = false;
private int jj_gc = 0; private int jj_gc = 0;
/** Constructor with InputStream. */
public JsonParserImpl(java.io.InputStream stream) { public JsonParserImpl(java.io.InputStream stream) {
this(stream, null); this(stream, null);
} }
/** Constructor with InputStream and supplied encoding */
public JsonParserImpl(java.io.InputStream stream, String encoding) { public JsonParserImpl(java.io.InputStream stream, String encoding) {
try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); } try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
token_source = new JsonParserImplTokenManager(jj_input_stream); token_source = new JsonParserImplTokenManager(jj_input_stream);
token = new Token(); token = new Token();
jj_ntk = -1; jj_ntk = -1;
jj_gen = 0; jj_gen = 0;
for (int i = 0; i < 15; i++) jj_la1[i] = -1; for (int i = 0; i < 16; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
} }
/** Reinitialise. */
public void ReInit(java.io.InputStream stream) { public void ReInit(java.io.InputStream stream) {
ReInit(stream, null); ReInit(stream, null);
} }
/** Reinitialise. */
public void ReInit(java.io.InputStream stream, String encoding) { public void ReInit(java.io.InputStream stream, String encoding) {
try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); } try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
token_source.ReInit(jj_input_stream); token_source.ReInit(jj_input_stream);
token = new Token(); token = new Token();
jj_ntk = -1; jj_ntk = -1;
jj_gen = 0; jj_gen = 0;
for (int i = 0; i < 15; i++) jj_la1[i] = -1; for (int i = 0; i < 16; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
} }
/** Constructor. */
public JsonParserImpl(java.io.Reader stream) { public JsonParserImpl(java.io.Reader stream) {
jj_input_stream = new SimpleCharStream(stream, 1, 1); jj_input_stream = new SimpleCharStream(stream, 1, 1);
token_source = new JsonParserImplTokenManager(jj_input_stream); token_source = new JsonParserImplTokenManager(jj_input_stream);
token = new Token(); token = new Token();
jj_ntk = -1; jj_ntk = -1;
jj_gen = 0; jj_gen = 0;
for (int i = 0; i < 15; i++) jj_la1[i] = -1; for (int i = 0; i < 16; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
} }
/** Reinitialise. */
public void ReInit(java.io.Reader stream) { public void ReInit(java.io.Reader stream) {
jj_input_stream.ReInit(stream, 1, 1); jj_input_stream.ReInit(stream, 1, 1);
token_source.ReInit(jj_input_stream); token_source.ReInit(jj_input_stream);
token = new Token(); token = new Token();
jj_ntk = -1; jj_ntk = -1;
jj_gen = 0; jj_gen = 0;
for (int i = 0; i < 15; i++) jj_la1[i] = -1; for (int i = 0; i < 16; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
} }
/** Constructor with generated Token Manager. */
public JsonParserImpl(JsonParserImplTokenManager tm) { public JsonParserImpl(JsonParserImplTokenManager tm) {
token_source = tm; token_source = tm;
token = new Token(); token = new Token();
jj_ntk = -1; jj_ntk = -1;
jj_gen = 0; jj_gen = 0;
for (int i = 0; i < 15; i++) jj_la1[i] = -1; for (int i = 0; i < 16; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
} }
/** Reinitialise. */
public void ReInit(JsonParserImplTokenManager tm) { public void ReInit(JsonParserImplTokenManager tm) {
token_source = tm; token_source = tm;
token = new Token(); token = new Token();
jj_ntk = -1; jj_ntk = -1;
jj_gen = 0; jj_gen = 0;
for (int i = 0; i < 15; i++) jj_la1[i] = -1; for (int i = 0; i < 16; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); 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 { private Token jj_consume_token(int kind) throws ParseException {
Token oldToken; Token oldToken;
if ((oldToken = token).next != null) token = token.next; if ((oldToken = token).next != null) token = token.next;
else token = token.next = token_source.getNextToken(); else token = token.next = token_source.getNextToken();
@ -506,7 +534,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
static private final class LookaheadSuccess extends java.lang.Error { } static private final class LookaheadSuccess extends java.lang.Error { }
final private LookaheadSuccess jj_ls = new LookaheadSuccess(); final private LookaheadSuccess jj_ls = new LookaheadSuccess();
final private boolean jj_scan_token(int kind) { private boolean jj_scan_token(int kind) {
if (jj_scanpos == jj_lastpos) { if (jj_scanpos == jj_lastpos) {
jj_la--; jj_la--;
if (jj_scanpos.next == null) { if (jj_scanpos.next == null) {
@ -527,6 +555,8 @@ final class JsonParserImpl implements JsonParserImplConstants {
return false; return false;
} }
/** Get the next Token. */
final public Token getNextToken() { final public Token getNextToken() {
if (token.next != null) token = token.next; if (token.next != null) token = token.next;
else token = token.next = token_source.getNextToken(); else token = token.next = token_source.getNextToken();
@ -535,8 +565,9 @@ final class JsonParserImpl implements JsonParserImplConstants {
return token; return token;
} }
/** Get the specific Token. */
final public Token getToken(int index) { final public Token getToken(int index) {
Token t = lookingAhead ? jj_scanpos : token; Token t = token;
for (int i = 0; i < index; i++) { for (int i = 0; i < index; i++) {
if (t.next != null) t = t.next; if (t.next != null) t = t.next;
else t = t.next = token_source.getNextToken(); else t = t.next = token_source.getNextToken();
@ -544,14 +575,14 @@ final class JsonParserImpl implements JsonParserImplConstants {
return t; return t;
} }
final private int jj_ntk() { private int jj_ntk() {
if ((jj_nt=token.next) == null) if ((jj_nt=token.next) == null)
return (jj_ntk = (token.next=token_source.getNextToken()).kind); return (jj_ntk = (token.next=token_source.getNextToken()).kind);
else else
return (jj_ntk = jj_nt.kind); return (jj_ntk = jj_nt.kind);
} }
private java.util.Vector jj_expentries = new java.util.Vector(); private java.util.List jj_expentries = new java.util.ArrayList();
private int[] jj_expentry; private int[] jj_expentry;
private int jj_kind = -1; private int jj_kind = -1;
private int[] jj_lasttokens = new int[100]; private int[] jj_lasttokens = new int[100];
@ -566,36 +597,31 @@ final class JsonParserImpl implements JsonParserImplConstants {
for (int i = 0; i < jj_endpos; i++) { for (int i = 0; i < jj_endpos; i++) {
jj_expentry[i] = jj_lasttokens[i]; jj_expentry[i] = jj_lasttokens[i];
} }
boolean exists = false; jj_entries_loop: for (java.util.Iterator it = jj_expentries.iterator(); it.hasNext();) {
for (java.util.Enumeration e = jj_expentries.elements(); e.hasMoreElements();) { int[] oldentry = (int[])(it.next());
int[] oldentry = (int[])(e.nextElement());
if (oldentry.length == jj_expentry.length) { if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) { for (int i = 0; i < jj_expentry.length; i++) {
if (oldentry[i] != jj_expentry[i]) { if (oldentry[i] != jj_expentry[i]) {
exists = false; continue jj_entries_loop;
break;
} }
} }
if (exists) break; jj_expentries.add(jj_expentry);
break jj_entries_loop;
} }
} }
if (!exists) jj_expentries.addElement(jj_expentry);
if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind; if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
} }
} }
/** Generate ParseException. */
public ParseException generateParseException() { public ParseException generateParseException() {
jj_expentries.removeAllElements(); jj_expentries.clear();
boolean[] la1tokens = new boolean[33]; boolean[] la1tokens = new boolean[34];
for (int i = 0; i < 33; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) { if (jj_kind >= 0) {
la1tokens[jj_kind] = true; la1tokens[jj_kind] = true;
jj_kind = -1; jj_kind = -1;
} }
for (int i = 0; i < 15; i++) { for (int i = 0; i < 16; i++) {
if (jj_la1[i] == jj_gen) { if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) { for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) { if ((jj_la1_0[i] & (1<<j)) != 0) {
@ -607,11 +633,11 @@ final class JsonParserImpl implements JsonParserImplConstants {
} }
} }
} }
for (int i = 0; i < 33; i++) { for (int i = 0; i < 34; i++) {
if (la1tokens[i]) { if (la1tokens[i]) {
jj_expentry = new int[1]; jj_expentry = new int[1];
jj_expentry[0] = i; jj_expentry[0] = i;
jj_expentries.addElement(jj_expentry); jj_expentries.add(jj_expentry);
} }
} }
jj_endpos = 0; jj_endpos = 0;
@ -619,18 +645,20 @@ final class JsonParserImpl implements JsonParserImplConstants {
jj_add_error_token(0, 0); jj_add_error_token(0, 0);
int[][] exptokseq = new int[jj_expentries.size()][]; int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) { for (int i = 0; i < jj_expentries.size(); i++) {
exptokseq[i] = (int[])jj_expentries.elementAt(i); exptokseq[i] = (int[])jj_expentries.get(i);
} }
return new ParseException(token, exptokseq, tokenImage); return new ParseException(token, exptokseq, tokenImage);
} }
/** Enable tracing. */
final public void enable_tracing() { final public void enable_tracing() {
} }
/** Disable tracing. */
final public void disable_tracing() { final public void disable_tracing() {
} }
final private void jj_rescan_token() { private void jj_rescan_token() {
jj_rescan = true; jj_rescan = true;
for (int i = 0; i < 1; i++) { for (int i = 0; i < 1; i++) {
try { try {
@ -649,7 +677,7 @@ final class JsonParserImpl implements JsonParserImplConstants {
jj_rescan = false; jj_rescan = false;
} }
final private void jj_save(int index, int xla) { private void jj_save(int index, int xla) {
JJCalls p = jj_2_rtns[index]; JJCalls p = jj_2_rtns[index];
while (p.gen > jj_gen) { while (p.gen > jj_gen) {
if (p.next == null) { p = p.next = new JJCalls(); break; } if (p.next == null) { p = p.next = new JJCalls(); break; }

62
gson/src/main/java/com/google/gson/JsonParserImplConstants.java
View File

@ -1,47 +1,79 @@
/* Generated By:JavaCC: Do not edit this line. JsonParserImplConstants.java */ /* Generated By:JavaCC: Do not edit this line. JsonParserImplConstants.java */
package com.google.gson; package com.google.gson;
/**
* Token literal values and constants.
* Generated by org.javacc.parser.OtherFilesGen#start()
*/
@SuppressWarnings("all") @SuppressWarnings("all")
interface JsonParserImplConstants { interface JsonParserImplConstants {
/** End of File. */
int EOF = 0; int EOF = 0;
int E = 5; /** RegularExpression Id. */
int EXPONENT = 5;
/** RegularExpression Id. */
int DIGITS = 6; int DIGITS = 6;
/** RegularExpression Id. */
int NULL = 7; int NULL = 7;
/** RegularExpression Id. */
int NAN = 8; int NAN = 8;
/** RegularExpression Id. */
int INFINITY = 9; int INFINITY = 9;
/** RegularExpression Id. */
int BOOLEAN = 10; int BOOLEAN = 10;
int IDENTIFIER = 11; /** RegularExpression Id. */
int HEX_CHAR = 12; int IDENTIFIER_SANS_EXPONENT = 11;
int UNICODE_CHAR = 13; /** RegularExpression Id. */
int ESCAPE_CHAR = 14; int IDENTIFIER_STARTS_WITH_EXPONENT = 12;
int SINGLE_QUOTE_LITERAL = 15; /** RegularExpression Id. */
int DOUBLE_QUOTE_LITERAL = 16; int HEX_CHAR = 13;
int QUOTE = 17; /** RegularExpression Id. */
int ENDQUOTE = 19; int UNICODE_CHAR = 14;
int CHAR = 20; /** RegularExpression Id. */
int CNTRL_ESC = 21; int ESCAPE_CHAR = 15;
int HEX = 23; /** RegularExpression Id. */
int HEX_ESC = 24; int SINGLE_QUOTE_LITERAL = 16;
/** RegularExpression Id. */
int DOUBLE_QUOTE_LITERAL = 17;
/** RegularExpression Id. */
int QUOTE = 18;
/** RegularExpression Id. */
int ENDQUOTE = 20;
/** RegularExpression Id. */
int CHAR = 21;
/** RegularExpression Id. */
int CNTRL_ESC = 22;
/** RegularExpression Id. */
int HEX = 24;
/** RegularExpression Id. */
int HEX_ESC = 25;
/** Lexical state. */
int DEFAULT = 0; int DEFAULT = 0;
/** Lexical state. */
int STRING_STATE = 1; int STRING_STATE = 1;
/** Lexical state. */
int ESC_STATE = 2; int ESC_STATE = 2;
/** Lexical state. */
int HEX_STATE = 3; int HEX_STATE = 3;
/** Literal token values. */
String[] tokenImage = { String[] tokenImage = {
"<EOF>", "<EOF>",
"\" \"", "\" \"",
"\"\\t\"", "\"\\t\"",
"\"\\n\"", "\"\\n\"",
"\"\\r\"", "\"\\r\"",
"<E>", "<EXPONENT>",
"<DIGITS>", "<DIGITS>",
"\"null\"", "\"null\"",
"\"NaN\"", "\"NaN\"",
"\"Infinity\"", "\"Infinity\"",
"<BOOLEAN>", "<BOOLEAN>",
"<IDENTIFIER>", "<IDENTIFIER_SANS_EXPONENT>",
"<IDENTIFIER_STARTS_WITH_EXPONENT>",
"<HEX_CHAR>", "<HEX_CHAR>",
"<UNICODE_CHAR>", "<UNICODE_CHAR>",
"<ESCAPE_CHAR>", "<ESCAPE_CHAR>",

603
gson/src/main/java/com/google/gson/JsonParserImplTokenManager.java
View File

File diff suppressed because it is too large Load Diff

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

@ -26,13 +26,14 @@ SKIP : { " " | "\t" | "\n" | "\r" }
* will allow that. * will allow that.
*/ */
TOKEN : { TOKEN : {
<E : ["e","E"](["+","-"])?> <EXPONENT : ("e"|"E")["+","-","0"-"9"](["0"-"9"])*>
| <DIGITS : (["0"-"9"])+> | <DIGITS : (["0"-"9"])+>
| <NULL : "null"> | <NULL : "null">
| <NAN : "NaN"> | <NAN : "NaN">
| <INFINITY : "Infinity"> | <INFINITY : "Infinity">
| <BOOLEAN : ("true" | "false")> | <BOOLEAN : ("true" | "false")>
| <IDENTIFIER : ["a"-"z","A"-"Z", "_"] (["a"-"z","A"-"Z","0"-"9","_"])* > | <IDENTIFIER_SANS_EXPONENT : ["a"-"d","f"-"z","A"-"D","F"-"Z", "_"] (["a"-"z","A"-"Z","0"-"9","_"])* >
| <IDENTIFIER_STARTS_WITH_EXPONENT : ["e","E"] (["a"-"z","A"-"Z","0"-"9","_"])* >
| <#HEX_CHAR : ["a"-"f","A"-"F","0"-"9"]> | <#HEX_CHAR : ["a"-"f","A"-"F","0"-"9"]>
| <UNICODE_CHAR : "\\u" <HEX_CHAR><HEX_CHAR><HEX_CHAR><HEX_CHAR> > | <UNICODE_CHAR : "\\u" <HEX_CHAR><HEX_CHAR><HEX_CHAR><HEX_CHAR> >
| <#ESCAPE_CHAR: "\\" ["n","t","b","r","f","\\","'","\"", "/"] > | <#ESCAPE_CHAR: "\\" ["n","t","b","r","f","\\","'","\"", "/"] >
@ -104,7 +105,7 @@ private void Pair(JsonObject o) :
private JsonPrimitive JsonMemberName() : private JsonPrimitive JsonMemberName() :
{ Token t; JsonPrimitive value; } { Token t; JsonPrimitive value; }
{ {
t=<IDENTIFIER> { return new JsonPrimitive(t.image); } | t= Identifier() { return new JsonPrimitive(t.image); } |
value=JsonString() { return value; } value=JsonString() { return value; }
} }
@ -213,13 +214,15 @@ private String JsonFrac() :
} }
private String JsonExp() : private String JsonExp() :
{ Token t; }
{ {
Token t; t = <EXPONENT> {return t.image;}
String digits;
} }
private Token Identifier() :
{ Token t; }
{ {
t=<E> digits=Digits() (t = <IDENTIFIER_STARTS_WITH_EXPONENT> | t = <IDENTIFIER_SANS_EXPONENT>) {return t;}
{ return t.image + digits; }
} }
private String Digits() : private String Digits() :

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

@ -205,6 +205,16 @@ public class PrimitiveTest extends TestCase {
assertEquals(expected.doubleValue(), actual1); assertEquals(expected.doubleValue(), actual1);
} }
public void testLargeDoubleDeserialization() {
String doubleValue = "1.234567899E8";
Double expected = Double.valueOf(doubleValue);
Double actual = gson.fromJson(doubleValue, Double.class);
assertEquals(expected, actual);
double actual1 = gson.fromJson(doubleValue, double.class);
assertEquals(expected.doubleValue(), actual1);
}
public void testPrimitiveDoubleAutoboxedInASingleElementArrayDeserialization() { public void testPrimitiveDoubleAutoboxedInASingleElementArrayDeserialization() {
double expected = -122.08; double expected = -122.08;
double actual = gson.fromJson("[-122.08]", double.class); double actual = gson.fromJson("[-122.08]", double.class);