From 9726b4e172370349947fc88dbdb8d6efd17bf8c1 Mon Sep 17 00:00:00 2001 From: Inderjeet Singh Date: Mon, 13 Oct 2008 22:09:15 +0000 Subject: [PATCH] updated Gson version number to 1.2.1 Removed unused productions from Gson grammar. Also removed unused imports. --- gson/pom.xml | 2 +- .../main/java/com/google/gson/JsonParser.java | 90 +++---------------- .../com/google/gson/JsonParserConstants.java | 1 - .../google/gson/JsonParserTokenManager.java | 8 -- .../java/com/google/gson/TypeInfoArray.java | 5 +- gson/src/main/javacc/JsonParser.jj | 55 +----------- 6 files changed, 18 insertions(+), 143 deletions(-) diff --git a/gson/pom.xml b/gson/pom.xml index f896468f..d3588fff 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -4,7 +4,7 @@ com.google.code.gson gson jar - 1.2 + 1.2.1 2008 Gson http://code.google.com/p/google-gson/ diff --git a/gson/src/main/java/com/google/gson/JsonParser.java b/gson/src/main/java/com/google/gson/JsonParser.java index a18398f9..8c79ec17 100755 --- a/gson/src/main/java/com/google/gson/JsonParser.java +++ b/gson/src/main/java/com/google/gson/JsonParser.java @@ -1,17 +1,6 @@ /* Generated By:JavaCC: Do not edit this line. JsonParser.java */ package com.google.gson; -import java.math.BigDecimal; -import java.math.BigInteger; - -import java.util.ArrayList; -import java.util.List; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; - @SuppressWarnings("all") final class JsonParser implements JsonParserConstants { @@ -219,7 +208,7 @@ final class JsonParser implements JsonParserConstants { } Number n; if (exppart != null) { - n = new BigDecimal(intpart + fracpart + exppart); + n = new java.math.BigDecimal(intpart + fracpart + exppart); } else if (fracpart != null) { n = new Double(intpart + fracpart); } else { @@ -230,7 +219,7 @@ final class JsonParser implements JsonParserConstants { } else if (intpart.length() < 19) { n = new Long(intpart); } else { - n = new BigInteger(intpart); + n = new java.math.BigInteger(intpart); } } {if (true) return new JsonPrimitive(n);} @@ -299,75 +288,18 @@ final class JsonParser implements JsonParserConstants { throw new Error("Missing return statement in function"); } - final private void Chars(StringBuffer strbuf) throws ParseException { - char c; - c = Char(); - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CHAR: - case CNTRL_ESC: - case HEX_ESC: - Chars(strbuf); - break; - default: - jj_la1[11] = jj_gen; - ; - } - strbuf.insert(0, c); - } - - final private char Char() throws ParseException { - Token t; - switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case CHAR: - t = jj_consume_token(CHAR); - break; - case CNTRL_ESC: - t = jj_consume_token(CNTRL_ESC); - break; - case HEX_ESC: - t = jj_consume_token(HEX_ESC); - break; - default: - jj_la1[12] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - if(t.image.length() < 2) { - {if (true) return t.image.charAt(0);} - } - if(t.image.length() < 6) { - char c = t.image.charAt(1); - switch(t.image.charAt(1)) { - //control characters - case 'b' : {if (true) return (char) 8;} break; - case 'f' : {if (true) return (char) 12;} break; - case 'n' : {if (true) return (char) 10;} break; - case 'r' : {if (true) return (char) 13;} break; - case 't' : {if (true) return (char) 9;} break; - default : {if (true) return c;} //characters that represent themselves - } - } - else { //hex escape code - //create an integer from our hex values - //and then cast into a char - int i = Integer.valueOf(t.image.substring(2,6), 16).intValue(); - {if (true) return (char) i;} - } - 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[13]; + 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,0x98000,0x98000,}; + jj_la1_0 = new int[] {0x3a500c40,0xc00,0x800000,0x3a500c40,0x800000,0x3a500c40,0x38000c40,0x40000000,0x20,0x20000000,0xc00,}; } public JsonParser(java.io.InputStream stream) { @@ -379,7 +311,7 @@ final class JsonParser implements JsonParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 13; i++) jj_la1[i] = -1; + for (int i = 0; i < 11; i++) jj_la1[i] = -1; } public void ReInit(java.io.InputStream stream) { @@ -391,7 +323,7 @@ final class JsonParser implements JsonParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 13; i++) jj_la1[i] = -1; + for (int i = 0; i < 11; i++) jj_la1[i] = -1; } public JsonParser(java.io.Reader stream) { @@ -400,7 +332,7 @@ final class JsonParser implements JsonParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 13; i++) jj_la1[i] = -1; + for (int i = 0; i < 11; i++) jj_la1[i] = -1; } public void ReInit(java.io.Reader stream) { @@ -409,7 +341,7 @@ final class JsonParser implements JsonParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 13; i++) jj_la1[i] = -1; + for (int i = 0; i < 11; i++) jj_la1[i] = -1; } public JsonParser(JsonParserTokenManager tm) { @@ -417,7 +349,7 @@ final class JsonParser implements JsonParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 13; i++) jj_la1[i] = -1; + for (int i = 0; i < 11; i++) jj_la1[i] = -1; } public void ReInit(JsonParserTokenManager tm) { @@ -425,7 +357,7 @@ final class JsonParser implements JsonParserConstants { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 13; i++) jj_la1[i] = -1; + for (int i = 0; i < 11; i++) jj_la1[i] = -1; } final private Token jj_consume_token(int kind) throws ParseException { @@ -480,7 +412,7 @@ final class JsonParser implements JsonParserConstants { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 13; i++) { + 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<[][] types, it will return the type - * representing Foo[] (i.e. {@code new TypeToken[]>() {}.getType()}). + * It will return Foo[].class for Foo[][]. For Foo<String>[][] types, it will return the + * type representing Foo<String>[] + * (i.e. new TypeToken[]>() {}.getType()). */ public Type getSecondLevelType() { return secondLevel; diff --git a/gson/src/main/javacc/JsonParser.jj b/gson/src/main/javacc/JsonParser.jj index 18e86e25..d6a97a65 100755 --- a/gson/src/main/javacc/JsonParser.jj +++ b/gson/src/main/javacc/JsonParser.jj @@ -13,17 +13,6 @@ PARSER_BEGIN(JsonParser) package com.google.gson; -import java.math.BigDecimal; -import java.math.BigInteger; - -import java.util.ArrayList; -import java.util.List; - -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; - @SuppressWarnings("all") final class JsonParser { @@ -162,7 +151,7 @@ private JsonPrimitive JsonNumber() : { Number n; if (exppart != null) { - n = new BigDecimal(intpart + fracpart + exppart); + n = new java.math.BigDecimal(intpart + fracpart + exppart); } else if (fracpart != null) { n = new Double(intpart + fracpart); } else { @@ -173,7 +162,7 @@ private JsonPrimitive JsonNumber() : } else if (intpart.length() < 19) { n = new Long(intpart); } else { - n = new BigInteger(intpart); + n = new java.math.BigInteger(intpart); } } return new JsonPrimitive(n); @@ -222,45 +211,7 @@ private JsonPrimitive JsonString() : { Token t; } { (t= | t=) { - String value = StringDemarshaller.unmarshall(t.image); + String value = StringUnmarshaller.unmarshall(t.image); return new JsonPrimitive(value); } } - -private void Chars(StringBuffer strbuf) : -{ char c; } -{ - c=Char() [ Chars(strbuf) ] - { strbuf.insert(0, c); } -} - -private char Char() : -{ Token t; } -{ -( t= -| t= -| t= ) - { - if(t.image.length() < 2) { - return t.image.charAt(0); - } - if(t.image.length() < 6) { - char c = t.image.charAt(1); - switch(t.image.charAt(1)) { - //control characters - case 'b' : return (char) 8; break; - case 'f' : return (char) 12; break; - case 'n' : return (char) 10; break; - case 'r' : return (char) 13; break; - case 't' : return (char) 9; break; - default : return c; //characters that represent themselves - } - } - else { //hex escape code - //create an integer from our hex values - //and then cast into a char - int i = Integer.valueOf(t.image.substring(2,6), 16).intValue(); - return (char) i; - } - } -} \ No newline at end of file