This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 079bd88461 Regenerate with latest JavaCC then run code-cleanup
079bd88461 is described below
commit 079bd88461f7099375af0ad524fab3efde140dad
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 25 20:32:13 2024 +0100
Regenerate with latest JavaCC then run code-cleanup
---
java/org/apache/el/parser/ELParserConstants.java | 61 +---------------
.../org/apache/el/parser/ELParserTokenManager.java | 81 +---------------------
.../apache/el/parser/ELParserTreeConstants.java | 44 +-----------
java/org/apache/el/parser/JJTELParserState.java | 12 ----
4 files changed, 4 insertions(+), 194 deletions(-)
diff --git a/java/org/apache/el/parser/ELParserConstants.java
b/java/org/apache/el/parser/ELParserConstants.java
index 64be914f31..9eb57a6cc8 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -1,6 +1,7 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. ELParserConstants.java */
package org.apache.el.parser;
+
/**
* Token literal values and constants. Generated by
org.javacc.parser.OtherFilesGen#start()
*/
@@ -8,184 +9,125 @@ public interface ELParserConstants {
/** End of File. */
int EOF = 0;
-
/** RegularExpression Id. */
int LITERAL_EXPRESSION = 1;
-
/** RegularExpression Id. */
int START_DYNAMIC_EXPRESSION = 2;
-
/** RegularExpression Id. */
int START_DEFERRED_EXPRESSION = 3;
-
/** RegularExpression Id. */
int START_SET_OR_MAP = 8;
-
/** RegularExpression Id. */
int RBRACE = 9;
-
/** RegularExpression Id. */
int INTEGER_LITERAL = 10;
-
/** RegularExpression Id. */
int FLOATING_POINT_LITERAL = 11;
-
/** RegularExpression Id. */
int EXPONENT = 12;
-
/** RegularExpression Id. */
int STRING_LITERAL = 13;
-
/** RegularExpression Id. */
int TRUE = 14;
-
/** RegularExpression Id. */
int FALSE = 15;
-
/** RegularExpression Id. */
int NULL = 16;
-
/** RegularExpression Id. */
int DOT = 17;
-
/** RegularExpression Id. */
int LPAREN = 18;
-
/** RegularExpression Id. */
int RPAREN = 19;
-
/** RegularExpression Id. */
int LBRACK = 20;
-
/** RegularExpression Id. */
int RBRACK = 21;
-
/** RegularExpression Id. */
int COLON = 22;
-
/** RegularExpression Id. */
int SEMICOLON = 23;
-
/** RegularExpression Id. */
int COMMA = 24;
-
/** RegularExpression Id. */
int GT0 = 25;
-
/** RegularExpression Id. */
int GT1 = 26;
-
/** RegularExpression Id. */
int LT0 = 27;
-
/** RegularExpression Id. */
int LT1 = 28;
-
/** RegularExpression Id. */
int GE0 = 29;
-
/** RegularExpression Id. */
int GE1 = 30;
-
/** RegularExpression Id. */
int LE0 = 31;
-
/** RegularExpression Id. */
int LE1 = 32;
-
/** RegularExpression Id. */
int EQ0 = 33;
-
/** RegularExpression Id. */
int EQ1 = 34;
-
/** RegularExpression Id. */
int NE0 = 35;
-
/** RegularExpression Id. */
int NE1 = 36;
-
/** RegularExpression Id. */
int NOT0 = 37;
-
/** RegularExpression Id. */
int NOT1 = 38;
-
/** RegularExpression Id. */
int AND0 = 39;
-
/** RegularExpression Id. */
int AND1 = 40;
-
/** RegularExpression Id. */
int OR0 = 41;
-
/** RegularExpression Id. */
int OR1 = 42;
-
/** RegularExpression Id. */
int EMPTY = 43;
-
/** RegularExpression Id. */
int INSTANCEOF = 44;
-
/** RegularExpression Id. */
int MULT = 45;
-
/** RegularExpression Id. */
int PLUS = 46;
-
/** RegularExpression Id. */
int MINUS = 47;
-
/** RegularExpression Id. */
int QUESTIONMARK = 48;
-
/** RegularExpression Id. */
int DIV0 = 49;
-
/** RegularExpression Id. */
int DIV1 = 50;
-
/** RegularExpression Id. */
int MOD0 = 51;
-
/** RegularExpression Id. */
int MOD1 = 52;
-
/** RegularExpression Id. */
int CONCAT = 53;
-
/** RegularExpression Id. */
int ASSIGN = 54;
-
/** RegularExpression Id. */
int ARROW = 55;
-
/** RegularExpression Id. */
int IDENTIFIER = 56;
-
/** RegularExpression Id. */
int FUNCTIONSUFFIX = 57;
-
/** RegularExpression Id. */
int IMPL_OBJ_START = 58;
-
/** RegularExpression Id. */
int LETTER = 59;
-
/** RegularExpression Id. */
int DIGIT = 60;
-
/** RegularExpression Id. */
int ILLEGAL_CHARACTER = 61;
/** Lexical state. */
int DEFAULT = 0;
-
/** Lexical state. */
int IN_EXPRESSION = 1;
-
/** Lexical state. */
int IN_SET_OR_MAP = 2;
@@ -198,4 +140,5 @@ public interface ELParserConstants {
"\"empty\"", "\"instanceof\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"",
"\"/\"", "\"div\"", "\"%\"", "\"mod\"",
"\"+=\"", "\"=\"", "\"->\"", "<IDENTIFIER>", "<FUNCTIONSUFFIX>",
"\"#\"", "<LETTER>", "<DIGIT>",
"<ILLEGAL_CHARACTER>", };
+
}
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java
b/java/org/apache/el/parser/ELParserTokenManager.java
index 78409f126d..cc51f5a573 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -5,19 +5,16 @@ package org.apache.el.parser;
/** Token Manager. */
@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParserTokenManager implements ELParserConstants {
-
java.util.Deque<Integer> deque = new java.util.ArrayDeque<Integer>();
/** Debug output. */
public java.io.PrintStream debugStream = System.out;
-
/** Set debug output. */
public void setDebugStream(java.io.PrintStream ds) {
debugStream = ds;
}
-
private final int jjStopStringLiteralDfa_0(int pos, long active0) {
switch (pos) {
case 0:
@@ -31,19 +28,16 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private final int jjStartNfa_0(int pos, long active0) {
return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
}
-
private int jjStopAtPos(int pos, int kind) {
jjmatchedKind = kind;
jjmatchedPos = pos;
return pos + 1;
}
-
private int jjMoveStringLiteralDfa0_0() {
switch (curChar) {
case 35:
@@ -55,7 +49,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private int jjMoveStringLiteralDfa1_0(long active0) {
try {
curChar = input_stream.readChar();
@@ -77,13 +70,10 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_0(0, active0);
}
-
static final long[] jjbitVec0 =
{ 0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL,
0xffffffffffffffffL };
-
static final long[] jjbitVec2 = { 0x0L, 0x0L, 0xffffffffffffffffL,
0xffffffffffffffffL };
-
private int jjMoveNfa_0(int startState, int curPos) {
int startsAt = 0;
jjnewStateCnt = 8;
@@ -305,7 +295,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private final int jjStopStringLiteralDfa_2(int pos, long active0) {
switch (pos) {
case 0:
@@ -390,12 +379,10 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private final int jjStartNfa_2(int pos, long active0) {
return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
}
-
private int jjMoveStringLiteralDfa0_2() {
switch (curChar) {
case 33:
@@ -475,7 +462,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private int jjMoveStringLiteralDfa1_2(long active0) {
try {
curChar = input_stream.readChar();
@@ -556,7 +542,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(0, active0);
}
-
private int jjMoveStringLiteralDfa2_2(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_2(0, old0);
@@ -599,7 +584,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(1, active0);
}
-
private int jjMoveStringLiteralDfa3_2(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_2(1, old0);
@@ -631,7 +615,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(2, active0);
}
-
private int jjMoveStringLiteralDfa4_2(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_2(2, old0);
@@ -661,7 +644,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(3, active0);
}
-
private int jjMoveStringLiteralDfa5_2(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_2(3, old0);
@@ -681,7 +663,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(4, active0);
}
-
private int jjMoveStringLiteralDfa6_2(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_2(4, old0);
@@ -701,7 +682,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(5, active0);
}
-
private int jjMoveStringLiteralDfa7_2(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_2(5, old0);
@@ -721,7 +701,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(6, active0);
}
-
private int jjMoveStringLiteralDfa8_2(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_2(6, old0);
@@ -741,7 +720,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(7, active0);
}
-
private int jjMoveStringLiteralDfa9_2(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_2(7, old0);
@@ -764,7 +742,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_2(8, active0);
}
-
private int jjStartNfaWithStates_2(int pos, int kind, int state) {
jjmatchedKind = kind;
jjmatchedPos = pos;
@@ -776,20 +753,13 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjMoveNfa_2(state, pos + 1);
}
-
static final long[] jjbitVec3 = { 0x1ff00000fffffffeL,
0xffffffffffffc000L, 0xffffffffL, 0x600000000000000L };
-
static final long[] jjbitVec4 = { 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL };
-
static final long[] jjbitVec5 = { 0x0L, 0xffffffffffffffffL,
0xffffffffffffffffL, 0xffffffffffffffffL };
-
static final long[] jjbitVec6 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0xffffL, 0x0L };
-
static final long[] jjbitVec7 = { 0xffffffffffffffffL,
0xffffffffffffffffL, 0x0L, 0x0L };
-
static final long[] jjbitVec8 = { 0x3fffffffffffL, 0x0L, 0x0L, 0x0L };
-
private int jjMoveNfa_2(int startState, int curPos) {
int startsAt = 0;
jjnewStateCnt = 30;
@@ -1217,7 +1187,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private final int jjStopStringLiteralDfa_1(int pos, long active0) {
switch (pos) {
case 0:
@@ -1302,12 +1271,10 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private final int jjStartNfa_1(int pos, long active0) {
return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
}
-
private int jjMoveStringLiteralDfa0_1() {
switch (curChar) {
case 33:
@@ -1387,7 +1354,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private int jjMoveStringLiteralDfa1_1(long active0) {
try {
curChar = input_stream.readChar();
@@ -1468,7 +1434,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(0, active0);
}
-
private int jjMoveStringLiteralDfa2_1(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_1(0, old0);
@@ -1511,7 +1476,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(1, active0);
}
-
private int jjMoveStringLiteralDfa3_1(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_1(1, old0);
@@ -1543,7 +1507,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(2, active0);
}
-
private int jjMoveStringLiteralDfa4_1(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_1(2, old0);
@@ -1573,7 +1536,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(3, active0);
}
-
private int jjMoveStringLiteralDfa5_1(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_1(3, old0);
@@ -1593,7 +1555,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(4, active0);
}
-
private int jjMoveStringLiteralDfa6_1(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_1(4, old0);
@@ -1613,7 +1574,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(5, active0);
}
-
private int jjMoveStringLiteralDfa7_1(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_1(5, old0);
@@ -1633,7 +1593,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(6, active0);
}
-
private int jjMoveStringLiteralDfa8_1(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_1(6, old0);
@@ -1653,7 +1612,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(7, active0);
}
-
private int jjMoveStringLiteralDfa9_1(long old0, long active0) {
if (((active0 &= old0)) == 0L) {
return jjStartNfa_1(7, old0);
@@ -1676,7 +1634,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStartNfa_1(8, active0);
}
-
private int jjStartNfaWithStates_1(int pos, int kind, int state) {
jjmatchedKind = kind;
jjmatchedPos = pos;
@@ -1688,7 +1645,6 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjMoveNfa_1(state, pos + 1);
}
-
private int jjMoveNfa_1(int startState, int curPos) {
int startsAt = 0;
jjnewStateCnt = 30;
@@ -2116,7 +2072,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
/** Token literal values. */
public static final String[] jjstrLiteralImages = { "", null, "\44\173",
"\43\173", null, null, null, null, "\173",
"\175", null, null, null, null, "\164\162\165\145",
"\146\141\154\163\145", "\156\165\154\154", "\56",
@@ -2126,7 +2081,6 @@ public class ELParserTokenManager implements
ELParserConstants {
"\151\156\163\164\141\156\143\145\157\146", "\52", "\53", "\55",
"\77", "\57", "\144\151\166", "\45",
"\155\157\144", "\53\75", "\75", "\55\76", null, null, null, null,
null, null, };
-
protected Token jjFillToken() {
final Token t;
final String curTokenImage;
@@ -2150,11 +2104,9 @@ public class ELParserTokenManager implements
ELParserConstants {
return t;
}
-
static final int[] jjnextStates = { 0, 1, 3, 4, 2, 0, 1, 4, 2, 0, 1, 4, 5,
2, 0, 1, 2, 6, 16, 17, 18, 23, 24, 11,
12, 14, 6, 7, 9, 3, 4, 21, 22, 25, 26, };
-
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long
l1, long l2) {
switch (hiByte) {
case 0:
@@ -2167,7 +2119,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long
l1, long l2) {
switch (hiByte) {
case 0:
@@ -2188,20 +2139,13 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
int curLexState = 0;
-
int defaultLexState = 0;
-
int jjnewStateCnt;
-
int jjround;
-
int jjmatchedPos;
-
int jjmatchedKind;
-
/** Get the next Token. */
public Token getNextToken() {
Token matchedToken;
@@ -2303,7 +2247,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
void SkipLexicalActions(Token matchedToken) {
switch (jjmatchedKind) {
default:
@@ -2311,7 +2254,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
void MoreLexicalActions() {
jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
switch (jjmatchedKind) {
@@ -2320,7 +2262,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
void TokenLexicalActions(Token matchedToken) {
switch (jjmatchedKind) {
case 2:
@@ -2348,7 +2289,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private void jjCheckNAdd(int state) {
if (jjrounds[state] != jjround) {
jjstateSet[jjnewStateCnt++] = state;
@@ -2356,27 +2296,23 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
private void jjAddStates(int start, int end) {
do {
jjstateSet[jjnewStateCnt++] = jjnextStates[start];
} while (start++ != end);
}
-
private void jjCheckNAddTwoStates(int state1, int state2) {
jjCheckNAdd(state1);
jjCheckNAdd(state2);
}
-
private void jjCheckNAddStates(int start, int end) {
do {
jjCheckNAdd(jjnextStates[start]);
} while (start++ != end);
}
-
/** Constructor. */
public ELParserTokenManager(SimpleCharStream stream) {
@@ -2387,25 +2323,23 @@ public class ELParserTokenManager implements
ELParserConstants {
input_stream = stream;
}
-
/** Constructor. */
public ELParserTokenManager(SimpleCharStream stream, int lexState) {
ReInit(stream);
SwitchTo(lexState);
}
-
/** Reinitialise parser. */
public void ReInit(SimpleCharStream stream) {
+
jjmatchedPos = jjnewStateCnt = 0;
curLexState = defaultLexState;
input_stream = stream;
ReInitRounds();
}
-
private void ReInitRounds() {
int i;
jjround = 0x80000001;
@@ -2414,7 +2348,6 @@ public class ELParserTokenManager implements
ELParserConstants {
}
}
-
/** Reinitialise parser. */
public void ReInit(SimpleCharStream stream, int lexState)
@@ -2423,7 +2356,6 @@ public class ELParserTokenManager implements
ELParserConstants {
SwitchTo(lexState);
}
-
/** Switch to specified lex state. */
public void SwitchTo(int lexState) {
if (lexState >= 3 || lexState < 0) {
@@ -2442,28 +2374,17 @@ public class ELParserTokenManager implements
ELParserConstants {
public static final int[] jjnewLexState = { -1, -1, 1, 1, -1, -1, -1, -1,
2, -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 = { 0x23ffffffffffef0fL, };
-
static final long[] jjtoSkip = { 0xf0L, };
-
static final long[] jjtoSpecial = { 0x0L, };
-
static final long[] jjtoMore = { 0x0L, };
-
protected SimpleCharStream input_stream;
private final int[] jjrounds = new int[30];
-
private final int[] jjstateSet = new int[2 * 30];
-
private final StringBuilder jjimage = new StringBuilder();
-
private StringBuilder image = jjimage;
-
private int jjimageLen;
-
private int lengthOfMatch;
-
protected int curChar;
}
diff --git a/java/org/apache/el/parser/ELParserTreeConstants.java
b/java/org/apache/el/parser/ELParserTreeConstants.java
index ab1623e62e..240eaf2c90 100644
--- a/java/org/apache/el/parser/ELParserTreeConstants.java
+++ b/java/org/apache/el/parser/ELParserTreeConstants.java
@@ -2,93 +2,51 @@
package org.apache.el.parser;
public interface ELParserTreeConstants {
-
int JJTCOMPOSITEEXPRESSION = 0;
-
int JJTLITERALEXPRESSION = 1;
-
int JJTDEFERREDEXPRESSION = 2;
-
int JJTDYNAMICEXPRESSION = 3;
-
int JJTVOID = 4;
-
int JJTSEMICOLON = 5;
-
int JJTASSIGN = 6;
-
int JJTLAMBDAEXPRESSION = 7;
-
int JJTLAMBDAPARAMETERS = 8;
-
int JJTCHOICE = 9;
-
int JJTOR = 10;
-
int JJTAND = 11;
-
int JJTEQUAL = 12;
-
int JJTNOTEQUAL = 13;
-
int JJTLESSTHAN = 14;
-
int JJTGREATERTHAN = 15;
-
int JJTLESSTHANEQUAL = 16;
-
int JJTGREATERTHANEQUAL = 17;
-
int JJTCONCATENATION = 18;
-
int JJTPLUS = 19;
-
int JJTMINUS = 20;
-
int JJTMULT = 21;
-
int JJTDIV = 22;
-
int JJTMOD = 23;
-
int JJTNEGATIVE = 24;
-
int JJTNOT = 25;
-
int JJTEMPTY = 26;
-
int JJTVALUE = 27;
-
int JJTDOTSUFFIX = 28;
-
int JJTBRACKETSUFFIX = 29;
-
int JJTMETHODPARAMETERS = 30;
-
int JJTSETDATA = 31;
-
int JJTLISTDATA = 32;
-
int JJTMAPDATA = 33;
-
int JJTMAPENTRY = 34;
-
int JJTIDENTIFIER = 35;
-
int JJTFUNCTION = 36;
-
int JJTTRUE = 37;
-
int JJTFALSE = 38;
-
int JJTFLOATINGPOINT = 39;
-
int JJTINTEGER = 40;
-
int JJTSTRING = 41;
-
int JJTNULL = 42;
+
String[] jjtNodeName = { "CompositeExpression", "LiteralExpression",
"DeferredExpression", "DynamicExpression",
"void", "Semicolon", "Assign", "LambdaExpression",
"LambdaParameters", "Choice", "Or", "And", "Equal",
"NotEqual", "LessThan", "GreaterThan", "LessThanEqual",
"GreaterThanEqual", "Concatenation", "Plus",
diff --git a/java/org/apache/el/parser/JJTELParserState.java
b/java/org/apache/el/parser/JJTELParserState.java
index 7dc18ded58..e7dec64365 100644
--- a/java/org/apache/el/parser/JJTELParserState.java
+++ b/java/org/apache/el/parser/JJTELParserState.java
@@ -3,18 +3,13 @@ package org.apache.el.parser;
@SuppressWarnings("all") // Ignore warnings in generated code
public class JJTELParserState {
-
private java.util.List<Node> nodes;
-
private java.util.List<Integer> marks;
private int sp; // number of nodes on stack
-
private int mk; // current mark
-
private boolean node_created;
-
public JJTELParserState() {
nodes = new java.util.ArrayList<Node>();
marks = new java.util.ArrayList<Integer>();
@@ -22,7 +17,6 @@ public class JJTELParserState {
mk = 0;
}
-
/*
* Determines whether the current node was actually closed and pushed.
This should only be called in the final user
* action of a node scope.
@@ -31,7 +25,6 @@ public class JJTELParserState {
return node_created;
}
-
/*
* Call this to reinitialize the node stack. It is called automatically by
the parser's ReInit() method.
*/
@@ -42,7 +35,6 @@ public class JJTELParserState {
mk = 0;
}
-
/*
* Returns the root node of the AST. It only makes sense to call this
after a successful parse.
*/
@@ -50,14 +42,12 @@ public class JJTELParserState {
return nodes.get(0);
}
-
/* Pushes a node on to the stack. */
public void pushNode(Node n) {
nodes.add(n);
++sp;
}
-
/*
* Returns the node on the top of the stack, and remove it from the stack.
*/
@@ -68,13 +58,11 @@ public class JJTELParserState {
return nodes.remove(nodes.size() - 1);
}
-
/* Returns the node currently on the top of the stack. */
public Node peekNode() {
return nodes.get(nodes.size() - 1);
}
-
/*
* Returns the number of children on the stack in the current node scope.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
