From 85f7c939f69fa131d06872c94fbe2ff82fd62df5 Mon Sep 17 00:00:00 2001 From: Inderjeet Singh Date: Tue, 31 Mar 2009 17:58:35 +0000 Subject: [PATCH] Renamed JsonParserImpl to JsonParserJavacc for clarity. --- .../main/java/com/google/gson/JsonParser.java | 2 +- ...nParserImpl.java => JsonParserJavacc.java} | 20 +++++++++---------- ...ts.java => JsonParserJavaccConstants.java} | 4 ++-- ...java => JsonParserJavaccTokenManager.java} | 8 ++++---- gson/src/main/javacc/JsonParser.jj | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) rename gson/src/main/java/com/google/gson/{JsonParserImpl.java => JsonParserJavacc.java} (96%) rename gson/src/main/java/com/google/gson/{JsonParserImplConstants.java => JsonParserJavaccConstants.java} (94%) rename gson/src/main/java/com/google/gson/{JsonParserImplTokenManager.java => JsonParserJavaccTokenManager.java} (99%) diff --git a/gson/src/main/java/com/google/gson/JsonParser.java b/gson/src/main/java/com/google/gson/JsonParser.java index c1868cdb..9d3d1245 100755 --- a/gson/src/main/java/com/google/gson/JsonParser.java +++ b/gson/src/main/java/com/google/gson/JsonParser.java @@ -49,7 +49,7 @@ public final class JsonParser { */ public JsonElement parse(Reader json) throws JsonParseException { try { - JsonParserImpl parser = new JsonParserImpl(json); + JsonParserJavacc parser = new JsonParserJavacc(json); return parser.parse(); } catch (TokenMgrError e) { throw new JsonParseException("Failed parsing JSON source: " + json + " to Json", e); diff --git a/gson/src/main/java/com/google/gson/JsonParserImpl.java b/gson/src/main/java/com/google/gson/JsonParserJavacc.java similarity index 96% rename from gson/src/main/java/com/google/gson/JsonParserImpl.java rename to gson/src/main/java/com/google/gson/JsonParserJavacc.java index ee0090db..24a6baf2 100644 --- a/gson/src/main/java/com/google/gson/JsonParserImpl.java +++ b/gson/src/main/java/com/google/gson/JsonParserJavacc.java @@ -1,8 +1,8 @@ -/* Generated By:JavaCC: Do not edit this line. JsonParserImpl.java */ +/* Generated By:JavaCC: Do not edit this line. JsonParserJavacc.java */ package com.google.gson; @SuppressWarnings("all") -final class JsonParserImpl implements JsonParserImplConstants { +final class JsonParserJavacc implements JsonParserJavaccConstants { final public JsonElement parse() throws ParseException { JsonElement json = null; @@ -417,7 +417,7 @@ final class JsonParserImpl implements JsonParserImplConstants { } /** Generated Token Manager. */ - public JsonParserImplTokenManager token_source; + public JsonParserJavaccTokenManager token_source; SimpleCharStream jj_input_stream; /** Current token. */ public Token token; @@ -445,13 +445,13 @@ final class JsonParserImpl implements JsonParserImplConstants { private int jj_gc = 0; /** Constructor with InputStream. */ - public JsonParserImpl(java.io.InputStream stream) { + public JsonParserJavacc(java.io.InputStream stream) { this(stream, null); } /** Constructor with InputStream and supplied encoding */ - public JsonParserImpl(java.io.InputStream stream, String encoding) { + public JsonParserJavacc(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 JsonParserImplTokenManager(jj_input_stream); + token_source = new JsonParserJavaccTokenManager(jj_input_stream); token = new Token(); jj_ntk = -1; jj_gen = 0; @@ -475,9 +475,9 @@ final class JsonParserImpl implements JsonParserImplConstants { } /** Constructor. */ - public JsonParserImpl(java.io.Reader stream) { + public JsonParserJavacc(java.io.Reader stream) { jj_input_stream = new SimpleCharStream(stream, 1, 1); - token_source = new JsonParserImplTokenManager(jj_input_stream); + token_source = new JsonParserJavaccTokenManager(jj_input_stream); token = new Token(); jj_ntk = -1; jj_gen = 0; @@ -497,7 +497,7 @@ final class JsonParserImpl implements JsonParserImplConstants { } /** Constructor with generated Token Manager. */ - public JsonParserImpl(JsonParserImplTokenManager tm) { + public JsonParserJavacc(JsonParserJavaccTokenManager tm) { token_source = tm; token = new Token(); jj_ntk = -1; @@ -507,7 +507,7 @@ final class JsonParserImpl implements JsonParserImplConstants { } /** Reinitialise. */ - public void ReInit(JsonParserImplTokenManager tm) { + public void ReInit(JsonParserJavaccTokenManager tm) { token_source = tm; token = new Token(); jj_ntk = -1; diff --git a/gson/src/main/java/com/google/gson/JsonParserImplConstants.java b/gson/src/main/java/com/google/gson/JsonParserJavaccConstants.java similarity index 94% rename from gson/src/main/java/com/google/gson/JsonParserImplConstants.java rename to gson/src/main/java/com/google/gson/JsonParserJavaccConstants.java index 6ee6f179..531c66df 100644 --- a/gson/src/main/java/com/google/gson/JsonParserImplConstants.java +++ b/gson/src/main/java/com/google/gson/JsonParserJavaccConstants.java @@ -1,4 +1,4 @@ -/* Generated By:JavaCC: Do not edit this line. JsonParserImplConstants.java */ +/* Generated By:JavaCC: Do not edit this line. JsonParserJavaccConstants.java */ package com.google.gson; @@ -7,7 +7,7 @@ package com.google.gson; * Generated by org.javacc.parser.OtherFilesGen#start() */ @SuppressWarnings("all") -interface JsonParserImplConstants { +interface JsonParserJavaccConstants { /** End of File. */ int EOF = 0; diff --git a/gson/src/main/java/com/google/gson/JsonParserImplTokenManager.java b/gson/src/main/java/com/google/gson/JsonParserJavaccTokenManager.java similarity index 99% rename from gson/src/main/java/com/google/gson/JsonParserImplTokenManager.java rename to gson/src/main/java/com/google/gson/JsonParserJavaccTokenManager.java index 48da3a43..fa508dfa 100644 --- a/gson/src/main/java/com/google/gson/JsonParserImplTokenManager.java +++ b/gson/src/main/java/com/google/gson/JsonParserJavaccTokenManager.java @@ -1,9 +1,9 @@ -/* Generated By:JavaCC: Do not edit this line. JsonParserImplTokenManager.java */ +/* Generated By:JavaCC: Do not edit this line. JsonParserJavaccTokenManager.java */ package com.google.gson; /** Token Manager. */ @SuppressWarnings("all") -final class JsonParserImplTokenManager implements JsonParserImplConstants +final class JsonParserJavaccTokenManager implements JsonParserJavaccConstants { /** Debug output. */ @@ -1018,14 +1018,14 @@ private final int[] jjrounds = new int[43]; private final int[] jjstateSet = new int[86]; protected char curChar; /** Constructor. */ -public JsonParserImplTokenManager(SimpleCharStream stream){ +public JsonParserJavaccTokenManager(SimpleCharStream stream){ if (SimpleCharStream.staticFlag) throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer."); input_stream = stream; } /** Constructor. */ -public JsonParserImplTokenManager(SimpleCharStream stream, int lexState){ +public JsonParserJavaccTokenManager(SimpleCharStream stream, int lexState){ this(stream); SwitchTo(lexState); } diff --git a/gson/src/main/javacc/JsonParser.jj b/gson/src/main/javacc/JsonParser.jj index 47022f50..5f09cfae 100755 --- a/gson/src/main/javacc/JsonParser.jj +++ b/gson/src/main/javacc/JsonParser.jj @@ -9,16 +9,16 @@ options { UNICODE_INPUT = true; } -PARSER_BEGIN(JsonParserImpl) +PARSER_BEGIN(JsonParserJavacc) package com.google.gson; @SuppressWarnings("all") -final class JsonParserImpl { +final class JsonParserJavacc { } -PARSER_END(JsonParserImpl) +PARSER_END(JsonParserJavacc) SKIP : { " " | "\t" | "\n" | "\r" } /*