Author: remm
Date: Wed Oct 10 14:32:33 2018
New Revision: 1843456
URL: http://svn.apache.org/viewvc?rev=1843456&view=rev
Log:
Code improvements to limit manual changes in generated code. No functional
changes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.java
tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj
tomcat/trunk/java/org/apache/tomcat/util/json/JSONParserTokenManager.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.java?rev=1843456&r1=1843455&r2=1843456&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.java Wed Oct 10
14:32:33 2018
@@ -19,21 +19,10 @@
package org.apache.tomcat.util.json;
-import java.io.*;
-import java.util.*;
-import java.math.*;
-
/**
-* Basic JSON parser generated by JavaCC. It consumes the input provided
through the constructor when
+* Basic JSON parser generated by JavaCC. It consumes the input provided
through the constructor when
* {@code parseObject()}, {@code parseList()}, or {@code parse()} are called,
and there is no way to directly
* reset the state.
-* Set the {@code fallbackToString} property if you want to enable
-* unparsable constructs (such as unquoted strings) to be handled as Strings:
otherwise, they are a parse
-* error.
-*
-* <p />
-*
-* This class makes no pretenses towards being thread safe.
*/
@SuppressWarnings("all") // Ignore warnings in generated code
public class JSONParser implements JSONParserConstants {
@@ -41,39 +30,47 @@ public class JSONParser implements JSONP
private boolean nativeNumbers = false;
public JSONParser(String input) {
- this(new StringReader(input));
- }
+ this(new java.io.StringReader(input));
+ }
/**
- * Parses a JSON object into a Java {@code Map}.
- */
- public LinkedHashMap<String,Object> parseObject() throws ParseException {
- LinkedHashMap<String,Object> toReturn = object();
- if(!ensureEOF()) throw new IllegalStateException("Expected EOF, but
still had content to parse");
+ * Parses a JSON object into a Java {@code Map}.
+ */
+ public java.util.LinkedHashMap<String, Object> parseObject() throws
ParseException {
+ java.util.LinkedHashMap<String, Object> toReturn = object();
+ if (!ensureEOF()) {
+ throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ }
return toReturn;
}
/**
- * Parses a JSON array into a Java {@code List}.
- */
- public ArrayList<Object> parseArray() throws ParseException {
- ArrayList<Object> toReturn = list();
- if(!ensureEOF()) throw new IllegalStateException("Expected EOF, but
still had content to parse");
+ * Parses a JSON array into a Java {@code List}.
+ */
+ public java.util.ArrayList<Object> parseArray() throws ParseException {
+ java.util.ArrayList<Object> toReturn = list();
+ if (!ensureEOF()) {
+ throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ }
return toReturn;
}
/**
- * Parses any JSON-parseable object, returning the value.
- */
+ * Parses any JSON-parseable object, returning the value.
+ */
public Object parse() throws ParseException {
Object toReturn = anything();
- if(!ensureEOF()) throw new IllegalStateException("Expected EOF, but
still had content to parse");
+ if (!ensureEOF()) {
+ throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ }
return toReturn;
}
private static String substringBefore(String str, char delim) {
int pos = str.indexOf(delim);
- if(pos == -1) return str;
+ if (pos == -1) {
+ return str;
+ }
return str.substring(0, pos);
}
@@ -173,7 +170,7 @@ key = o.toString();
throw new Error("Missing return statement in function");
}
- final public LinkedHashMap<String,Object> object() throws ParseException
{final LinkedHashMap<String,Object> map = new LinkedHashMap<String,Object>();
+ final public java.util.LinkedHashMap<String, Object> object() throws
ParseException {final java.util.LinkedHashMap<String, Object> map = new
java.util.LinkedHashMap<String, Object>();
String key;
Object value;
jj_consume_token(BRACE_OPEN);
@@ -222,7 +219,7 @@ key = null; value = null;
throw new Error("Missing return statement in function");
}
- final public ArrayList<Object> list() throws ParseException {final
ArrayList<Object> list = new ArrayList<Object>();
+ final public java.util.ArrayList<Object> list() throws ParseException {final
java.util.ArrayList<Object> list = new java.util.ArrayList<Object>();
Object value;
jj_consume_token(BRACKET_OPEN);
switch (jj_nt.kind) {
@@ -331,19 +328,19 @@ b = Boolean.FALSE;
switch (jj_nt.kind) {
case NUMBER_DECIMAL:{
t = jj_consume_token(NUMBER_DECIMAL);
-if(nativeNumbers) {
+if (nativeNumbers) {
{if ("" != null) return new Long(t.image);}
} else {
- {if ("" != null) return new BigDecimal(t.image);}
+ {if ("" != null) return new java.math.BigDecimal(t.image);}
}
break;
}
case NUMBER_INTEGER:{
t = jj_consume_token(NUMBER_INTEGER);
-if(nativeNumbers) {
+if (nativeNumbers) {
{if ("" != null) return new Double(t.image);}
} else {
- {if ("" != null) return new
BigInteger(substringBefore(t.image, '.'));}
+ {if ("" != null) return new
java.math.BigInteger(substringBefore(t.image, '.'));}
}
break;
}
@@ -386,7 +383,7 @@ if(nativeNumbers) {
case STRING_DOUBLE_NONEMPTY:{
jj_consume_token(STRING_DOUBLE_NONEMPTY);
String image = token.image;
- {if ("" != null) return image.substring(1, image.length()-1);}
+ {if ("" != null) return image.substring(1, image.length() - 1);}
break;
}
default:
@@ -407,7 +404,7 @@ String image = token.image;
case STRING_SINGLE_NONEMPTY:{
jj_consume_token(STRING_SINGLE_NONEMPTY);
String image = token.image;
- {if ("" != null) return image.substring(1, image.length()-1);}
+ {if ("" != null) return image.substring(1, image.length() - 1);}
break;
}
default:
Modified: tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj?rev=1843456&r1=1843455&r2=1843456&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/json/JSONParser.jj Wed Oct 10
14:32:33 2018
@@ -25,9 +25,8 @@ options {
SUPPORT_CLASS_VISIBILITY_PUBLIC=true;
FORCE_LA_CHECK=true;
CACHE_TOKENS=true;
- SANITY_CHECK = true;
+ SANITY_CHECK=true;
STATIC=false;
- //KEEP_LINE_COLUMN=true;
}
PARSER_BEGIN(JSONParser)
@@ -51,60 +50,58 @@ PARSER_BEGIN(JSONParser)
package org.apache.tomcat.util.json;
-import java.io.*;
-import java.util.*;
-import java.math.*;
-
/**
-* Basic JSON parser generated by JavaCC. It consumes the input provided
through the constructor when
+* Basic JSON parser generated by JavaCC. It consumes the input provided
through the constructor when
* {@code parseObject()}, {@code parseList()}, or {@code parse()} are called,
and there is no way to directly
* reset the state.
-* Set the {@code fallbackToString} property if you want to enable
-* unparsable constructs (such as unquoted strings) to be handled as Strings:
otherwise, they are a parse
-* error.
-*
-* <p />
-*
-* This class makes no pretenses towards being thread safe.
*/
+@SuppressWarnings("all") // Ignore warnings in generated code
public class JSONParser {
private boolean nativeNumbers = false;
public JSONParser(String input) {
- this(new StringReader(input));
- }
+ this(new java.io.StringReader(input));
+ }
/**
- * Parses a JSON object into a Java {@code Map}.
- */
- public LinkedHashMap<String,Object> parseObject() throws ParseException {
- LinkedHashMap<String,Object> toReturn = object();
- if(!ensureEOF()) throw new IllegalStateException("Expected EOF, but
still had content to parse");
+ * Parses a JSON object into a Java {@code Map}.
+ */
+ public java.util.LinkedHashMap<String, Object> parseObject() throws
ParseException {
+ java.util.LinkedHashMap<String, Object> toReturn = object();
+ if (!ensureEOF()) {
+ throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ }
return toReturn;
}
/**
- * Parses a JSON array into a Java {@code List}.
- */
- public ArrayList<Object> parseArray() throws ParseException {
- ArrayList<Object> toReturn = list();
- if(!ensureEOF()) throw new IllegalStateException("Expected EOF, but
still had content to parse");
+ * Parses a JSON array into a Java {@code List}.
+ */
+ public java.util.ArrayList<Object> parseArray() throws ParseException {
+ java.util.ArrayList<Object> toReturn = list();
+ if (!ensureEOF()) {
+ throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ }
return toReturn;
}
/**
- * Parses any JSON-parseable object, returning the value.
- */
+ * Parses any JSON-parseable object, returning the value.
+ */
public Object parse() throws ParseException {
Object toReturn = anything();
- if(!ensureEOF()) throw new IllegalStateException("Expected EOF, but
still had content to parse");
+ if (!ensureEOF()) {
+ throw new IllegalStateException("Expected EOF, but still had
content to parse");
+ }
return toReturn;
}
private static String substringBefore(String str, char delim) {
int pos = str.indexOf(delim);
- if(pos == -1) return str;
+ if (pos == -1) {
+ return str;
+ }
return str.substring(0, pos);
}
@@ -125,8 +122,8 @@ SKIP: {
<C_SINGLE_COMMENT: "//" (~["\n","\r","\f"])* <EOL>>
| <C_MULTILINE_COMMENT: "/*" (~[])* "*/">
| <SH_SINGLE_COMMENT: "#" (~["\n","\r","\f"])* <EOL>>
-| <WHITESPACE: " " | "\t">
-| <EOL: "\n" | "\r" | "\f">
+| <WHITESPACE: " " | "\t">
+| <EOL: "\n" | "\r" | "\f">
}
// Common tokens
@@ -154,13 +151,13 @@ TOKEN:{
| <#DIGIT: (<DIGIT_NONZERO> | <ZERO>) >
| <NUMBER_INTEGER:
("-")?
- ( (<ZERO>)+ | ( <DIGIT_NONZERO> (<DIGIT>)* ) )
+ ( (<ZERO>)+ | ( <DIGIT_NONZERO> (<DIGIT>)* ) )
>
-| <NUMBER_DECIMAL:
- ("-")?
- ( (<ZERO>)+ | ( <DIGIT_NONZERO> (<DIGIT>)* ) )
- ("."
- (<DIGIT>)+
+| <NUMBER_DECIMAL:
+ ("-")?
+ ( (<ZERO>)+ | ( <DIGIT_NONZERO> (<DIGIT>)* ) )
+ ("."
+ (<DIGIT>)+
(
["e","E"]
("+" | "-")?
@@ -210,7 +207,7 @@ boolean ensureEOF() : {}{
{ return true; }
}
-Object anything() : {
+Object anything() : {
Object x;
}{
( x = object()
@@ -227,7 +224,7 @@ String objectKey() : {
(
key = string()
| key = symbol()
- | (
+ | (
nullValue()
{ key = null; }
)
@@ -239,14 +236,14 @@ String objectKey() : {
{ return key; }
}
-LinkedHashMap<String,Object> object() : {
- final LinkedHashMap<String,Object> map = new
LinkedHashMap<String,Object>();
+java.util.LinkedHashMap<String, Object> object() : {
+ final java.util.LinkedHashMap<String, Object> map = new
java.util.LinkedHashMap<String, Object>();
String key;
Object value;
}{
<BRACE_OPEN>
[
- key = objectKey()
+ key = objectKey()
<COLON>
value = anything()
{ map.put(key, value); }
@@ -264,8 +261,8 @@ LinkedHashMap<String,Object> object() :
{ return map; }
}
-ArrayList<Object> list() : {
- final ArrayList<Object> list = new ArrayList<Object>();
+java.util.ArrayList<Object> list() : {
+ final java.util.ArrayList<Object> list = new java.util.ArrayList<Object>();
Object value;
}{
<BRACKET_OPEN>
@@ -283,7 +280,7 @@ ArrayList<Object> list() : {
<BRACKET_CLOSE>
{
list.trimToSize();
- return list;
+ return list;
}
}
@@ -313,7 +310,7 @@ Boolean booleanValue(): {
) | (
<FALSE>
{ b = Boolean.FALSE; }
- )
+ )
)
{ return b; }
}
@@ -323,20 +320,20 @@ Number number(): {
}{
(
t = <NUMBER_DECIMAL>
- {
- if(nativeNumbers) {
+ {
+ if (nativeNumbers) {
return new Long(t.image);
} else {
- return new BigDecimal(t.image);
+ return new java.math.BigDecimal(t.image);
}
}
) | (
t = <NUMBER_INTEGER>
- {
- if(nativeNumbers) {
+ {
+ if (nativeNumbers) {
return new Double(t.image);
} else {
- return new BigInteger(substringBefore(t.image, '.'));
+ return new java.math.BigInteger(substringBefore(t.image, '.'));
}
}
)
@@ -345,7 +342,7 @@ Number number(): {
String string() : {
String s;
}{
- ( s = doubleQuoteString()
+ ( s = doubleQuoteString()
| s = singleQuoteString()
)
{ return s; }
@@ -358,9 +355,9 @@ String doubleQuoteString() : {
{ return ""; }
) | (
<STRING_DOUBLE_NONEMPTY>
- {
+ {
String image = token.image;
- return image.substring(1, image.length()-1);
+ return image.substring(1, image.length() - 1);
}
)
}
@@ -372,9 +369,9 @@ String singleQuoteString() : {
{ return ""; }
) | (
<STRING_SINGLE_NONEMPTY>
- {
+ {
String image = token.image;
- return image.substring(1, image.length()-1);
+ return image.substring(1, image.length() - 1);
}
)
}
Modified:
tomcat/trunk/java/org/apache/tomcat/util/json/JSONParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/json/JSONParserTokenManager.java?rev=1843456&r1=1843455&r2=1843456&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/json/JSONParserTokenManager.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/json/JSONParserTokenManager.java
Wed Oct 10 14:32:33 2018
@@ -569,8 +569,8 @@ private int jjMoveNfa_0(int startState,
/** Token literal values. */
public static final String[] jjstrLiteralImages = {
-"", null, null, null, null, null, "\54", "\173", "\175", "\72", "\133",
-"\135", null, null, null, null, null, null, null, null, null, null, "\47\47",
+"", null, null, null, null, null, "\54", "\173", "\175", "\72", "\133",
+"\135", null, null, null, null, null, null, null, null, null, null, "\47\47",
"\42\42", null, null, null, null, null, };
protected Token jjFillToken()
{
@@ -596,8 +596,8 @@ protected Token jjFillToken()
return t;
}
static final int[] jjnextStates = {
- 25, 26, 28, 34, 17, 20, 27, 35, 29, 25, 28, 29, 6, 7, 9, 11,
- 12, 14, 1, 2, 18, 19, 21, 23, 32, 33,
+ 25, 26, 28, 34, 17, 20, 27, 35, 29, 25, 28, 29, 6, 7, 9, 11,
+ 12, 14, 1, 2, 18, 19, 21, 23, 32, 33,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1,
long l2)
{
@@ -620,7 +620,7 @@ int jjmatchedPos;
int jjmatchedKind;
/** Get the next Token. */
-public Token getNextToken()
+public Token getNextToken()
{
Token matchedToken;
int curPos = 0;
@@ -748,11 +748,8 @@ private void jjCheckNAddStates(int start
}
/** Reinitialise parser. */
-
public void ReInit(JavaCharStream stream)
{
-
-
jjmatchedPos =
jjnewStateCnt =
0;
@@ -771,7 +768,6 @@ private void jjCheckNAddStates(int start
/** Reinitialise parser. */
public void ReInit(JavaCharStream stream, int lexState)
-
{
ReInit(stream);
SwitchTo(lexState);
@@ -794,20 +790,20 @@ public static final String[] lexStateNam
/** Lex State array. */
public static final int[] jjnewLexState = {
- -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, -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, -1, -1,
};
static final long[] jjtoToken = {
- 0x1ccf8fc1L,
+ 0x1ccf8fc1L,
};
static final long[] jjtoSkip = {
- 0x3eL,
+ 0x3eL,
};
static final long[] jjtoSpecial = {
- 0x0L,
+ 0x0L,
};
static final long[] jjtoMore = {
- 0x0L,
+ 0x0L,
};
protected JavaCharStream input_stream;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
