This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new cee261446c Regenerate with latest JavaCC and then run code-cleanup
cee261446c is described below
commit cee261446c3e3ecd6d209cf14c0c9d525b2306e0
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Sep 25 20:30:04 2024 +0100
Regenerate with latest JavaCC and then run code-cleanup
---
.../apache/el/parser/ELParserTreeConstants.java | 44 +---------------------
java/org/apache/el/parser/JJTELParserState.java | 12 ------
2 files changed, 1 insertion(+), 55 deletions(-)
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: [email protected]
For additional commands, e-mail: [email protected]
