Added support for accepting Object field names without quotes. Issue 41.

This commit is contained in:
Inderjeet Singh 2008-11-26 17:52:46 +00:00
parent 7334a33d14
commit 59be02d4de
5 changed files with 1579 additions and 1487 deletions

View File

@ -1,436 +1,454 @@
/* Generated By:JavaCC: Do not edit this line. JsonParser.java */
package com.google.gson;
@SuppressWarnings("all")
final class JsonParser implements JsonParserConstants {
final public JsonElement parse() throws ParseException {
JsonElement json = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 20:
json = JsonObject();
break;
case 25:
json = JsonArray();
break;
case DIGITS:
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
case 27:
case 28:
case 29:
json = JsonPrimitive();
break;
case 22:
json = JsonNull();
break;
default:
jj_la1[0] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
{if (true) return json;}
throw new Error("Missing return statement in function");
}
final private JsonObject JsonObject() throws ParseException {
JsonObject o = new JsonObject();
jj_consume_token(20);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
Members(o);
break;
default:
jj_la1[1] = jj_gen;
;
}
jj_consume_token(21);
{if (true) return o;}
throw new Error("Missing return statement in function");
}
final private JsonNull JsonNull() throws ParseException {
JsonNull json = JsonNull.INSTANCE;
jj_consume_token(22);
{if (true) return json;}
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 23:
jj_consume_token(23);
Members(o);
break;
default:
jj_la1[2] = jj_gen;
;
}
}
final private void Pair(JsonObject o) throws ParseException {
JsonPrimitive property;
JsonElement value;
property = JsonString();
jj_consume_token(24);
value = JsonValue();
o.add(property.getAsString(), value);
}
final private JsonArray JsonArray() throws ParseException {
JsonArray array = new JsonArray();
jj_consume_token(25);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DIGITS:
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
case 20:
case 22:
case 25:
case 27:
case 28:
case 29:
Elements(array);
break;
default:
jj_la1[3] = jj_gen;
;
}
jj_consume_token(26);
array.reverse();
{if (true) return array;}
throw new Error("Missing return statement in function");
}
final private void Elements(JsonArray array) throws ParseException {
JsonElement element;
element = JsonValue();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 23:
jj_consume_token(23);
Elements(array);
break;
default:
jj_la1[4] = jj_gen;
;
}
array.add(element);
}
final private JsonElement JsonValue() throws ParseException {
JsonElement o = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
o = JsonString();
break;
case DIGITS:
case 29:
o = JsonNumber();
break;
case 20:
o = JsonObject();
break;
case 25:
o = JsonArray();
break;
case 27:
jj_consume_token(27);
o = new JsonPrimitive(true);
break;
case 28:
jj_consume_token(28);
o = new JsonPrimitive(false);
break;
case 22:
jj_consume_token(22);
break;
default:
jj_la1[5] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
{if (true) return o;}
throw new Error("Missing return statement in function");
}
final private JsonPrimitive JsonPrimitive() throws ParseException {
JsonPrimitive value;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
value = JsonString();
{if (true) return value;}
break;
case DIGITS:
case 29:
value = JsonNumber();
{if (true) return value;}
break;
case 27:
jj_consume_token(27);
{if (true) return new JsonPrimitive(true);}
break;
case 28:
jj_consume_token(28);
{if (true) return new JsonPrimitive(false);}
break;
default:
jj_la1[6] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
final private JsonPrimitive JsonNumber() throws ParseException {
String intpart = null,
fracpart = null,
exppart = null;
intpart = JsonInt();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 30:
fracpart = JsonFrac();
break;
default:
jj_la1[7] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case E:
exppart = JsonExp();
break;
default:
jj_la1[8] = jj_gen;
;
}
Number n;
if (exppart != null || fracpart != null) {
fracpart = (fracpart == null) ? "" : fracpart;
exppart = (exppart == null) ? "" : exppart;
n = new java.math.BigDecimal(intpart + fracpart + exppart);
} else {
n = new java.math.BigInteger(intpart);
}
{if (true) return new JsonPrimitive(n);}
throw new Error("Missing return statement in function");
}
final private String JsonInt() throws ParseException {
String digits;
boolean negative = false;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 29:
jj_consume_token(29);
negative = true;
break;
default:
jj_la1[9] = jj_gen;
;
}
digits = Digits();
if(negative)
{if (true) return "-" + digits;}
{if (true) return digits;}
throw new Error("Missing return statement in function");
}
final private String JsonFrac() throws ParseException {
String digits;
jj_consume_token(30);
digits = Digits();
{if (true) return "." + digits;}
throw new Error("Missing return statement in function");
}
final private String JsonExp() throws ParseException {
Token t;
String digits;
t = jj_consume_token(E);
digits = Digits();
{if (true) return t.image + digits;}
throw new Error("Missing return statement in function");
}
final private String Digits() throws ParseException {
Token t;
t = jj_consume_token(DIGITS);
{if (true) return t.image;}
throw new Error("Missing return statement in function");
}
final private JsonPrimitive JsonString() throws ParseException {
Token t;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SINGLE_QUOTE_LITERAL:
t = jj_consume_token(SINGLE_QUOTE_LITERAL);
break;
case DOUBLE_QUOTE_LITERAL:
t = jj_consume_token(DOUBLE_QUOTE_LITERAL);
break;
default:
jj_la1[10] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
String value = StringUnmarshaller.unmarshall(t.image);
{if (true) return new JsonPrimitive(value);}
throw new Error("Missing return statement in function");
}
public JsonParserTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
private int jj_ntk;
private int jj_gen;
final private int[] jj_la1 = new int[11];
static private int[] jj_la1_0;
static {
jj_la1_0();
}
private static void jj_la1_0() {
jj_la1_0 = new int[] {0x3a500c40,0xc00,0x800000,0x3a500c40,0x800000,0x3a500c40,0x38000c40,0x40000000,0x20,0x20000000,0xc00,};
}
public JsonParser(java.io.InputStream stream) {
this(stream, null);
}
public JsonParser(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); }
token_source = new JsonParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 11; i++) jj_la1[i] = -1;
}
public void ReInit(java.io.InputStream stream) {
ReInit(stream, null);
}
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); }
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 11; i++) jj_la1[i] = -1;
}
public JsonParser(java.io.Reader stream) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
token_source = new JsonParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 11; i++) jj_la1[i] = -1;
}
public void ReInit(java.io.Reader stream) {
jj_input_stream.ReInit(stream, 1, 1);
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 11; i++) jj_la1[i] = -1;
}
public JsonParser(JsonParserTokenManager tm) {
token_source = tm;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 11; i++) jj_la1[i] = -1;
}
public void ReInit(JsonParserTokenManager tm) {
token_source = tm;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 11; i++) jj_la1[i] = -1;
}
final private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
if ((oldToken = token).next != null) token = token.next;
else token = token.next = token_source.getNextToken();
jj_ntk = -1;
if (token.kind == kind) {
jj_gen++;
return token;
}
token = oldToken;
jj_kind = kind;
throw generateParseException();
}
final public Token getNextToken() {
if (token.next != null) token = token.next;
else token = token.next = token_source.getNextToken();
jj_ntk = -1;
jj_gen++;
return token;
}
final public Token getToken(int index) {
Token t = token;
for (int i = 0; i < index; i++) {
if (t.next != null) t = t.next;
else t = t.next = token_source.getNextToken();
}
return t;
}
final private int jj_ntk() {
if ((jj_nt=token.next) == null)
return (jj_ntk = (token.next=token_source.getNextToken()).kind);
else
return (jj_ntk = jj_nt.kind);
}
private java.util.Vector jj_expentries = new java.util.Vector();
private int[] jj_expentry;
private int jj_kind = -1;
public ParseException generateParseException() {
jj_expentries.removeAllElements();
boolean[] la1tokens = new boolean[31];
for (int i = 0; i < 31; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
for (int i = 0; i < 11; 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;
}
}
}
}
for (int i = 0; i < 31; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
jj_expentries.addElement(jj_expentry);
}
}
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
exptokseq[i] = (int[])jj_expentries.elementAt(i);
}
return new ParseException(token, exptokseq, tokenImage);
}
final public void enable_tracing() {
}
final public void disable_tracing() {
}
}
/* Generated By:JavaCC: Do not edit this line. JsonParser.java */
package com.google.gson;
@SuppressWarnings("all")
final class JsonParser implements JsonParserConstants {
final public JsonElement parse() throws ParseException {
JsonElement json = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 23:
json = JsonObject();
break;
case 27:
json = JsonArray();
break;
case DIGITS:
case BOOLEAN:
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
case 29:
json = JsonPrimitive();
break;
case NULL:
json = JsonNull();
break;
default:
jj_la1[0] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
{if (true) return json;}
throw new Error("Missing return statement in function");
}
final private JsonObject JsonObject() throws ParseException {
JsonObject o = new JsonObject();
jj_consume_token(23);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
Members(o);
break;
default:
jj_la1[1] = jj_gen;
;
}
jj_consume_token(24);
{if (true) return o;}
throw new Error("Missing return statement in function");
}
final private JsonNull JsonNull() throws ParseException {
Token t;
t = jj_consume_token(NULL);
{if (true) return JsonNull.INSTANCE;}
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);
Members(o);
break;
default:
jj_la1[2] = jj_gen;
;
}
}
final private void Pair(JsonObject o) throws ParseException {
JsonPrimitive property;
JsonElement value;
property = JsonMemberName();
jj_consume_token(26);
value = JsonValue();
o.add(property.getAsString(), value);
}
final private JsonPrimitive JsonMemberName() throws ParseException {
Token t; JsonPrimitive value;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENTIFIER:
t = jj_consume_token(IDENTIFIER);
{if (true) return new JsonPrimitive(t.image);}
break;
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
value = JsonString();
{if (true) return value;}
break;
default:
jj_la1[3] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
final private JsonArray JsonArray() throws ParseException {
JsonArray array = new JsonArray();
jj_consume_token(27);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DIGITS:
case NULL:
case BOOLEAN:
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
case 23:
case 27:
case 29:
Elements(array);
break;
default:
jj_la1[4] = jj_gen;
;
}
jj_consume_token(28);
array.reverse();
{if (true) return array;}
throw new Error("Missing return statement in function");
}
final private void Elements(JsonArray array) throws ParseException {
JsonElement element;
element = JsonValue();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 25:
jj_consume_token(25);
Elements(array);
break;
default:
jj_la1[5] = jj_gen;
;
}
array.add(element);
}
final private JsonElement JsonValue() throws ParseException {
JsonElement o = null;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
o = JsonString();
break;
case DIGITS:
case 29:
o = JsonNumber();
break;
case 23:
o = JsonObject();
break;
case 27:
o = JsonArray();
break;
case BOOLEAN:
o = JsonBoolean();
break;
case NULL:
jj_consume_token(NULL);
break;
default:
jj_la1[6] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
{if (true) return o;}
throw new Error("Missing return statement in function");
}
final private JsonPrimitive JsonBoolean() throws ParseException {
Token t;
t = jj_consume_token(BOOLEAN);
boolean value = Boolean.valueOf(t.image);
{if (true) return new JsonPrimitive(value);}
throw new Error("Missing return statement in function");
}
final private JsonPrimitive JsonPrimitive() throws ParseException {
JsonPrimitive value;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SINGLE_QUOTE_LITERAL:
case DOUBLE_QUOTE_LITERAL:
value = JsonString();
{if (true) return value;}
break;
case DIGITS:
case 29:
value = JsonNumber();
{if (true) return value;}
break;
case BOOLEAN:
value = JsonBoolean();
{if (true) return value;}
break;
default:
jj_la1[7] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
throw new Error("Missing return statement in function");
}
final private JsonPrimitive JsonNumber() throws ParseException {
String intpart = null,
fracpart = null,
exppart = null;
intpart = JsonInt();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 30:
fracpart = JsonFrac();
break;
default:
jj_la1[8] = jj_gen;
;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case E:
exppart = JsonExp();
break;
default:
jj_la1[9] = jj_gen;
;
}
Number n;
if (exppart != null || fracpart != null) {
fracpart = (fracpart == null) ? "" : fracpart;
exppart = (exppart == null) ? "" : exppart;
n = new java.math.BigDecimal(intpart + fracpart + exppart);
} else {
n = new java.math.BigInteger(intpart);
}
{if (true) return new JsonPrimitive(n);}
throw new Error("Missing return statement in function");
}
final private String JsonInt() throws ParseException {
String digits;
boolean negative = false;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case 29:
jj_consume_token(29);
negative = true;
break;
default:
jj_la1[10] = jj_gen;
;
}
digits = Digits();
if(negative)
{if (true) return "-" + digits;}
{if (true) return digits;}
throw new Error("Missing return statement in function");
}
final private String JsonFrac() throws ParseException {
String digits;
jj_consume_token(30);
digits = Digits();
{if (true) return "." + digits;}
throw new Error("Missing return statement in function");
}
final private String JsonExp() throws ParseException {
Token t;
String digits;
t = jj_consume_token(E);
digits = Digits();
{if (true) return t.image + digits;}
throw new Error("Missing return statement in function");
}
final private String Digits() throws ParseException {
Token t;
t = jj_consume_token(DIGITS);
{if (true) return t.image;}
throw new Error("Missing return statement in function");
}
final private JsonPrimitive JsonString() throws ParseException {
Token t;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SINGLE_QUOTE_LITERAL:
t = jj_consume_token(SINGLE_QUOTE_LITERAL);
break;
case DOUBLE_QUOTE_LITERAL:
t = jj_consume_token(DOUBLE_QUOTE_LITERAL);
break;
default:
jj_la1[11] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
String value = StringUnmarshaller.unmarshall(t.image);
{if (true) return new JsonPrimitive(value);}
throw new Error("Missing return statement in function");
}
public JsonParserTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
private int jj_ntk;
private int jj_gen;
final private int[] jj_la1 = new int[12];
static private int[] jj_la1_0;
static {
jj_la1_0();
}
private static void jj_la1_0() {
jj_la1_0 = new int[] {0x288061c0,0x6200,0x2000000,0x6200,0x288061c0,0x2000000,0x288061c0,0x20006140,0x40000000,0x20,0x20000000,0x6000,};
}
public JsonParser(java.io.InputStream stream) {
this(stream, null);
}
public JsonParser(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); }
token_source = new JsonParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
}
public void ReInit(java.io.InputStream stream) {
ReInit(stream, null);
}
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); }
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
}
public JsonParser(java.io.Reader stream) {
jj_input_stream = new SimpleCharStream(stream, 1, 1);
token_source = new JsonParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
}
public void ReInit(java.io.Reader stream) {
jj_input_stream.ReInit(stream, 1, 1);
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
}
public JsonParser(JsonParserTokenManager tm) {
token_source = tm;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
}
public void ReInit(JsonParserTokenManager tm) {
token_source = tm;
token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 12; i++) jj_la1[i] = -1;
}
final private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
if ((oldToken = token).next != null) token = token.next;
else token = token.next = token_source.getNextToken();
jj_ntk = -1;
if (token.kind == kind) {
jj_gen++;
return token;
}
token = oldToken;
jj_kind = kind;
throw generateParseException();
}
final public Token getNextToken() {
if (token.next != null) token = token.next;
else token = token.next = token_source.getNextToken();
jj_ntk = -1;
jj_gen++;
return token;
}
final public Token getToken(int index) {
Token t = token;
for (int i = 0; i < index; i++) {
if (t.next != null) t = t.next;
else t = t.next = token_source.getNextToken();
}
return t;
}
final private int jj_ntk() {
if ((jj_nt=token.next) == null)
return (jj_ntk = (token.next=token_source.getNextToken()).kind);
else
return (jj_ntk = jj_nt.kind);
}
private java.util.Vector jj_expentries = new java.util.Vector();
private int[] jj_expentry;
private int jj_kind = -1;
public ParseException generateParseException() {
jj_expentries.removeAllElements();
boolean[] la1tokens = new boolean[31];
for (int i = 0; i < 31; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
}
for (int i = 0; i < 12; 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;
}
}
}
}
for (int i = 0; i < 31; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
jj_expentries.addElement(jj_expentry);
}
}
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
exptokseq[i] = (int[])jj_expentries.elementAt(i);
}
return new ParseException(token, exptokseq, tokenImage);
}
final public void enable_tracing() {
}
final public void disable_tracing() {
}
}

View File

@ -1,60 +1,64 @@
/* Generated By:JavaCC: Do not edit this line. JsonParserConstants.java */
package com.google.gson;
interface JsonParserConstants {
int EOF = 0;
int E = 5;
int DIGITS = 6;
int HEX_CHAR = 7;
int UNICODE_CHAR = 8;
int ESCAPE_CHAR = 9;
int SINGLE_QUOTE_LITERAL = 10;
int DOUBLE_QUOTE_LITERAL = 11;
int QUOTE = 12;
int ENDQUOTE = 14;
int CHAR = 15;
int CNTRL_ESC = 16;
int HEX = 18;
int HEX_ESC = 19;
int DEFAULT = 0;
int STRING_STATE = 1;
int ESC_STATE = 2;
int HEX_STATE = 3;
String[] tokenImage = {
"<EOF>",
"\" \"",
"\"\\t\"",
"\"\\n\"",
"\"\\r\"",
"<E>",
"<DIGITS>",
"<HEX_CHAR>",
"<UNICODE_CHAR>",
"<ESCAPE_CHAR>",
"<SINGLE_QUOTE_LITERAL>",
"<DOUBLE_QUOTE_LITERAL>",
"\"\\\"\"",
"\"\\\\\"",
"<ENDQUOTE>",
"<CHAR>",
"<CNTRL_ESC>",
"\"u\"",
"<HEX>",
"<HEX_ESC>",
"\"{\"",
"\"}\"",
"\"null\"",
"\",\"",
"\":\"",
"\"[\"",
"\"]\"",
"\"true\"",
"\"false\"",
"\"-\"",
"\".\"",
};
}
/* Generated By:JavaCC: Do not edit this line. JsonParserConstants.java */
package com.google.gson;
@SuppressWarnings("all")
interface JsonParserConstants {
int EOF = 0;
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 DEFAULT = 0;
int STRING_STATE = 1;
int ESC_STATE = 2;
int HEX_STATE = 3;
String[] tokenImage = {
"<EOF>",
"\" \"",
"\"\\t\"",
"\"\\n\"",
"\"\\r\"",
"<E>",
"<DIGITS>",
"\"null\"",
"<BOOLEAN>",
"<IDENTIFIER>",
"<HEX_CHAR>",
"<UNICODE_CHAR>",
"<ESCAPE_CHAR>",
"<SINGLE_QUOTE_LITERAL>",
"<DOUBLE_QUOTE_LITERAL>",
"\"\\\"\"",
"\"\\\\\"",
"<ENDQUOTE>",
"<CHAR>",
"<CNTRL_ESC>",
"\"u\"",
"<HEX>",
"<HEX_ESC>",
"\"{\"",
"\"}\"",
"\",\"",
"\":\"",
"\"[\"",
"\"]\"",
"\"-\"",
"\".\"",
};
}

File diff suppressed because it is too large Load Diff

View File

@ -28,6 +28,9 @@ SKIP : { " " | "\t" | "\n" | "\r" }
TOKEN : {
<E : ["e","E"](["+","-"])?>
| <DIGITS : (["0"-"9"])+>
| <NULL : "null">
| <BOOLEAN : ("true" | "false")>
| <IDENTIFIER : ["a"-"z","A"-"Z", "_"] (["a"-"z","A"-"Z","0"-"9","_"])* >
| <#HEX_CHAR : ["a"-"f","A"-"F","0"-"9"]>
| <UNICODE_CHAR : "\\u" <HEX_CHAR><HEX_CHAR><HEX_CHAR><HEX_CHAR> >
| <#ESCAPE_CHAR: "\\" ["n","t","b","r","f","\\","'","\"", "/"] >
@ -72,11 +75,10 @@ private JsonObject JsonObject() :
private JsonNull JsonNull() :
{
JsonNull json = JsonNull.INSTANCE;
Token t;
}
{
"null"
{ return json; }
t = <NULL> { return JsonNull.INSTANCE; }
}
private void Members(JsonObject o) :
@ -91,12 +93,19 @@ private void Pair(JsonObject o) :
JsonElement value;
}
{
property=JsonString() ":" value=JsonValue()
property=JsonMemberName() ":" value=JsonValue()
{
o.add(property.getAsString(), value);
}
}
private JsonPrimitive JsonMemberName() :
{ Token t; JsonPrimitive value; }
{
t=<IDENTIFIER> { return new JsonPrimitive(t.image); } |
value=JsonString() { return value; }
}
private JsonArray JsonArray() :
{ JsonArray array = new JsonArray(); }
{
@ -123,12 +132,20 @@ private JsonElement JsonValue() :
o=JsonNumber() |
o=JsonObject() |
o=JsonArray() |
( "true" { o = new JsonPrimitive(true); } ) |
( "false" { o = new JsonPrimitive(false); } ) |
o=JsonBoolean() |
"null" )
{ return o; }
}
private JsonPrimitive JsonBoolean() :
{ Token t; }
{
t=<BOOLEAN> {
boolean value = Boolean.valueOf(t.image);
return new JsonPrimitive(value);
}
}
private JsonPrimitive JsonPrimitive() :
{
JsonPrimitive value;
@ -136,8 +153,7 @@ private JsonPrimitive JsonPrimitive() :
{
( value=JsonString()) { return value; } |
( value=JsonNumber()) { return value; } |
( "true" { return new JsonPrimitive(true); }) |
( "false" { return new JsonPrimitive(false); } )
( value=JsonBoolean()) { return value; }
}
private JsonPrimitive JsonNumber() :

View File

@ -131,4 +131,16 @@ public class StringTest extends TestCase {
value = gson.fromJson(json, String.class);
assertEquals("abc=", value);
}
public void testJavascriptKeywordsInStringSerialization() {
String value = "null true false function";
String json = gson.toJson(value);
assertEquals("\"" + value + "\"", json);
}
public void testJavascriptKeywordsInStringDeserialization() {
String json = "'null true false function'";
String value = gson.fromJson(json, String.class);
assertEquals(json.substring(1, json.length() - 1), value);
}
}