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 882b445ab8 Remove the unused INSTANCEOF and FUNCTIONSUFFIX
882b445ab8 is described below
commit 882b445ab82efd9fc24d0f94079b50d6aa4dfc99
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 19 16:15:56 2025 +0100
Remove the unused INSTANCEOF and FUNCTIONSUFFIX
---
java/org/apache/el/parser/ELParser.java | 21 +-
java/org/apache/el/parser/ELParser.jjt | 2 -
java/org/apache/el/parser/ELParserConstants.java | 39 +-
.../org/apache/el/parser/ELParserTokenManager.java | 951 ++++++---------------
webapps/docs/changelog.xml | 4 +
5 files changed, 280 insertions(+), 737 deletions(-)
diff --git a/java/org/apache/el/parser/ELParser.java
b/java/org/apache/el/parser/ELParser.java
index 3d2bbcb4cd..90572f7b41 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -3436,9 +3436,9 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
private boolean jj_3R_Multiplication_247_9_71() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(51)) {
+ if (jj_scan_token(50)) {
jj_scanpos = xsp;
- if (jj_scan_token(52)) {
+ if (jj_scan_token(51)) {
return true;
}
}
@@ -3451,9 +3451,9 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
private boolean jj_3R_Multiplication_245_9_70() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(49)) {
+ if (jj_scan_token(48)) {
jj_scanpos = xsp;
- if (jj_scan_token(50)) {
+ if (jj_scan_token(49)) {
return true;
}
}
@@ -3910,11 +3910,10 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x1008860, 0x1008860, 0x0,
0x1000000, 0x1000000, 0x1008860, 0x0, 0x600,
- 0x600, 0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1,
0x0, 0x0, 0x1, 0x0, 0x1, 0x200000,
- 0xc000, 0xc000, 0x1e2000, 0x60000, 0x180000, 0x1e2000, 0x60,
0x60, 0x8000, 0x1000860, 0x0, 0x1000000,
- 0x0, 0x0, 0x0, 0x1008860, 0x0, 0x1000000, 0x0, 0x0, 0x1008860,
0x0, 0x1008860, 0x0, 0x1008860, 0x0, 0x0,
- 0x0, 0x0, };
+ jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x804860, 0x804860, 0x0,
0x800000, 0x800000, 0x804860, 0x0, 0x600, 0x600,
+ 0x600, 0x180, 0x180, 0x180, 0x1e, 0x6, 0x18, 0x1e, 0x1, 0x0,
0x0, 0x1, 0x0, 0x1, 0x100000, 0x6000,
+ 0x6000, 0xf1000, 0x30000, 0xc0000, 0xf1000, 0x60, 0x60,
0x4000, 0x800860, 0x0, 0x800000, 0x0, 0x0, 0x0,
+ 0x804860, 0x0, 0x800000, 0x0, 0x0, 0x804860, 0x0, 0x804860,
0x0, 0x804860, 0x0, 0x0, 0x0, 0x0, };
}
final private JJCalls[] jj_2_rtns = new JJCalls[9];
@@ -4189,7 +4188,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[61];
+ boolean[] la1tokens = new boolean[59];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -4206,7 +4205,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
}
}
}
- for (int i = 0; i < 61; i++) {
+ for (int i = 0; i < 59; i++) {
if (la1tokens[i]) {
jj_expentry = new int[1];
jj_expentry[0] = i;
diff --git a/java/org/apache/el/parser/ELParser.jjt
b/java/org/apache/el/parser/ELParser.jjt
index fca64c0408..60e8549a0a 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -535,7 +535,6 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
| < OR0 : "||" >
| < OR1 : "or" >
| < EMPTY : "empty" >
-| < INSTANCEOF : "instanceof" >
| < MULT : "*" >
| < PLUS : "+" >
| < MINUS : "-" >
@@ -548,7 +547,6 @@ java.util.Deque<Integer> deque = new
java.util.ArrayDeque<Integer>();
| < ASSIGN : "=" >
| < ARROW : "->" >
| < IDENTIFIER : <JAVALETTER> (<JAVALETTER>|<JAVADIGIT>)* >
-| < FUNCTIONSUFFIX : (<IDENTIFIER>) >
| < #JAVALETTER:
[
"\u0024",
diff --git a/java/org/apache/el/parser/ELParserConstants.java
b/java/org/apache/el/parser/ELParserConstants.java
index 82d6364fab..5de49226c5 100644
--- a/java/org/apache/el/parser/ELParserConstants.java
+++ b/java/org/apache/el/parser/ELParserConstants.java
@@ -88,39 +88,35 @@ public interface ELParserConstants {
/** RegularExpression Id. */
int EMPTY = 43;
/** RegularExpression Id. */
- int INSTANCEOF = 44;
+ int MULT = 44;
/** RegularExpression Id. */
- int MULT = 45;
+ int PLUS = 45;
/** RegularExpression Id. */
- int PLUS = 46;
+ int MINUS = 46;
/** RegularExpression Id. */
- int MINUS = 47;
+ int QUESTIONMARK = 47;
/** RegularExpression Id. */
- int QUESTIONMARK = 48;
+ int DIV0 = 48;
/** RegularExpression Id. */
- int DIV0 = 49;
+ int DIV1 = 49;
/** RegularExpression Id. */
- int DIV1 = 50;
+ int MOD0 = 50;
/** RegularExpression Id. */
- int MOD0 = 51;
+ int MOD1 = 51;
/** RegularExpression Id. */
- int MOD1 = 52;
+ int CONCAT = 52;
/** RegularExpression Id. */
- int CONCAT = 53;
+ int ASSIGN = 53;
/** RegularExpression Id. */
- int ASSIGN = 54;
+ int ARROW = 54;
/** RegularExpression Id. */
- int ARROW = 55;
+ int IDENTIFIER = 55;
/** RegularExpression Id. */
- int IDENTIFIER = 56;
+ int JAVALETTER = 56;
/** RegularExpression Id. */
- int FUNCTIONSUFFIX = 57;
+ int JAVADIGIT = 57;
/** RegularExpression Id. */
- int JAVALETTER = 58;
- /** RegularExpression Id. */
- int JAVADIGIT = 59;
- /** RegularExpression Id. */
- int ILLEGAL_CHARACTER = 60;
+ int ILLEGAL_CHARACTER = 58;
/** Lexical state. */
int DEFAULT = 0;
@@ -135,8 +131,7 @@ public interface ELParserConstants {
"<STRING_LITERAL>", "\"true\"", "\"false\"", "\"null\"", "\".\"",
"\"(\"", "\")\"", "\"[\"", "\"]\"",
"\":\"", "\";\"", "\",\"", "\">\"", "\"gt\"", "\"<\"", "\"lt\"",
"\">=\"", "\"ge\"", "\"<=\"", "\"le\"",
"\"==\"", "\"eq\"", "\"!=\"", "\"ne\"", "\"!\"", "\"not\"",
"\"&&\"", "\"and\"", "\"||\"", "\"or\"",
- "\"empty\"", "\"instanceof\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"",
"\"/\"", "\"div\"", "\"%\"", "\"mod\"",
- "\"+=\"", "\"=\"", "\"->\"", "<IDENTIFIER>", "<FUNCTIONSUFFIX>",
"<JAVALETTER>", "<JAVADIGIT>",
- "<ILLEGAL_CHARACTER>", };
+ "\"empty\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"", "\"/\"",
"\"div\"", "\"%\"", "\"mod\"", "\"+=\"", "\"=\"",
+ "\"->\"", "<IDENTIFIER>", "<JAVALETTER>", "<JAVADIGIT>",
"<ILLEGAL_CHARACTER>", };
}
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java
b/java/org/apache/el/parser/ELParserTokenManager.java
index e28776591c..8047a6c2f8 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -301,77 +301,39 @@ public class ELParserTokenManager implements
ELParserConstants {
if ((active0 & 0x20000L) != 0L) {
return 1;
}
- if ((active0 & 0x141d555401c000L) != 0L) {
- jjmatchedKind = 56;
- return 30;
+ if ((active0 & 0xa0d555401c000L) != 0L) {
+ jjmatchedKind = 55;
+ return 16;
}
return -1;
case 1:
- if ((active0 & 0x41554000000L) != 0L) {
- return 30;
- }
- if ((active0 & 0x1419400001c000L) != 0L) {
- jjmatchedKind = 56;
+ if ((active0 & 0xa09400001c000L) != 0L) {
+ jjmatchedKind = 55;
jjmatchedPos = 1;
- return 30;
+ return 16;
+ }
+ if ((active0 & 0x41554000000L) != 0L) {
+ return 16;
}
return -1;
case 2:
- if ((active0 & 0x14014000000000L) != 0L) {
- return 30;
+ if ((active0 & 0xa014000000000L) != 0L) {
+ return 16;
}
- if ((active0 & 0x18000001c000L) != 0L) {
- jjmatchedKind = 56;
+ if ((active0 & 0x8000001c000L) != 0L) {
+ jjmatchedKind = 55;
jjmatchedPos = 2;
- return 30;
+ return 16;
}
return -1;
case 3:
if ((active0 & 0x14000L) != 0L) {
- return 30;
+ return 16;
}
- if ((active0 & 0x180000008000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 3;
- return 30;
- }
- return -1;
- case 4:
if ((active0 & 0x80000008000L) != 0L) {
- return 30;
- }
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 4;
- return 30;
- }
- return -1;
- case 5:
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 5;
- return 30;
- }
- return -1;
- case 6:
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 6;
- return 30;
- }
- return -1;
- case 7:
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 7;
- return 30;
- }
- return -1;
- case 8:
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 8;
- return 30;
+ jjmatchedKind = 55;
+ jjmatchedPos = 3;
+ return 16;
}
return -1;
default:
@@ -389,7 +351,7 @@ public class ELParserTokenManager implements
ELParserConstants {
jjmatchedKind = 37;
return jjMoveStringLiteralDfa1_2(0x800000000L);
case 37:
- return jjStopAtPos(0, 51);
+ return jjStopAtPos(0, 50);
case 38:
return jjMoveStringLiteralDfa1_2(0x8000000000L);
case 40:
@@ -397,19 +359,19 @@ public class ELParserTokenManager implements
ELParserConstants {
case 41:
return jjStopAtPos(0, 19);
case 42:
- return jjStopAtPos(0, 45);
+ return jjStopAtPos(0, 44);
case 43:
- jjmatchedKind = 46;
- return jjMoveStringLiteralDfa1_2(0x20000000000000L);
+ jjmatchedKind = 45;
+ return jjMoveStringLiteralDfa1_2(0x10000000000000L);
case 44:
return jjStopAtPos(0, 24);
case 45:
- jjmatchedKind = 47;
- return jjMoveStringLiteralDfa1_2(0x80000000000000L);
+ jjmatchedKind = 46;
+ return jjMoveStringLiteralDfa1_2(0x40000000000000L);
case 46:
return jjStartNfaWithStates_2(0, 17, 1);
case 47:
- return jjStopAtPos(0, 49);
+ return jjStopAtPos(0, 48);
case 58:
return jjStopAtPos(0, 22);
case 59:
@@ -418,13 +380,13 @@ public class ELParserTokenManager implements
ELParserConstants {
jjmatchedKind = 27;
return jjMoveStringLiteralDfa1_2(0x80000000L);
case 61:
- jjmatchedKind = 54;
+ jjmatchedKind = 53;
return jjMoveStringLiteralDfa1_2(0x200000000L);
case 62:
jjmatchedKind = 25;
return jjMoveStringLiteralDfa1_2(0x20000000L);
case 63:
- return jjStopAtPos(0, 48);
+ return jjStopAtPos(0, 47);
case 91:
return jjStopAtPos(0, 20);
case 93:
@@ -432,19 +394,17 @@ public class ELParserTokenManager implements
ELParserConstants {
case 97:
return jjMoveStringLiteralDfa1_2(0x10000000000L);
case 100:
- return jjMoveStringLiteralDfa1_2(0x4000000000000L);
+ return jjMoveStringLiteralDfa1_2(0x2000000000000L);
case 101:
return jjMoveStringLiteralDfa1_2(0x80400000000L);
case 102:
return jjMoveStringLiteralDfa1_2(0x8000L);
case 103:
return jjMoveStringLiteralDfa1_2(0x44000000L);
- case 105:
- return jjMoveStringLiteralDfa1_2(0x100000000000L);
case 108:
return jjMoveStringLiteralDfa1_2(0x110000000L);
case 109:
- return jjMoveStringLiteralDfa1_2(0x10000000000000L);
+ return jjMoveStringLiteralDfa1_2(0x8000000000000L);
case 110:
return jjMoveStringLiteralDfa1_2(0x5000010000L);
case 111:
@@ -484,49 +444,49 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStopAtPos(1, 33);
} else if ((active0 & 0x800000000L) != 0L) {
return jjStopAtPos(1, 35);
- } else if ((active0 & 0x20000000000000L) != 0L) {
- return jjStopAtPos(1, 53);
+ } else if ((active0 & 0x10000000000000L) != 0L) {
+ return jjStopAtPos(1, 52);
}
break;
case 62:
- if ((active0 & 0x80000000000000L) != 0L) {
- return jjStopAtPos(1, 55);
+ if ((active0 & 0x40000000000000L) != 0L) {
+ return jjStopAtPos(1, 54);
}
break;
case 97:
return jjMoveStringLiteralDfa2_2(active0, 0x8000L);
case 101:
if ((active0 & 0x40000000L) != 0L) {
- return jjStartNfaWithStates_2(1, 30, 30);
+ return jjStartNfaWithStates_2(1, 30, 16);
} else if ((active0 & 0x100000000L) != 0L) {
- return jjStartNfaWithStates_2(1, 32, 30);
+ return jjStartNfaWithStates_2(1, 32, 16);
} else if ((active0 & 0x1000000000L) != 0L) {
- return jjStartNfaWithStates_2(1, 36, 30);
+ return jjStartNfaWithStates_2(1, 36, 16);
}
break;
case 105:
- return jjMoveStringLiteralDfa2_2(active0, 0x4000000000000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x2000000000000L);
case 109:
return jjMoveStringLiteralDfa2_2(active0, 0x80000000000L);
case 110:
- return jjMoveStringLiteralDfa2_2(active0, 0x110000000000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x10000000000L);
case 111:
- return jjMoveStringLiteralDfa2_2(active0, 0x10004000000000L);
+ return jjMoveStringLiteralDfa2_2(active0, 0x8004000000000L);
case 113:
if ((active0 & 0x400000000L) != 0L) {
- return jjStartNfaWithStates_2(1, 34, 30);
+ return jjStartNfaWithStates_2(1, 34, 16);
}
break;
case 114:
if ((active0 & 0x40000000000L) != 0L) {
- return jjStartNfaWithStates_2(1, 42, 30);
+ return jjStartNfaWithStates_2(1, 42, 16);
}
return jjMoveStringLiteralDfa2_2(active0, 0x4000L);
case 116:
if ((active0 & 0x4000000L) != 0L) {
- return jjStartNfaWithStates_2(1, 26, 30);
+ return jjStartNfaWithStates_2(1, 26, 16);
} else if ((active0 & 0x10000000L) != 0L) {
- return jjStartNfaWithStates_2(1, 28, 30);
+ return jjStartNfaWithStates_2(1, 28, 16);
}
break;
case 117:
@@ -555,27 +515,25 @@ public class ELParserTokenManager implements
ELParserConstants {
switch (curChar) {
case 100:
if ((active0 & 0x10000000000L) != 0L) {
- return jjStartNfaWithStates_2(2, 40, 30);
- } else if ((active0 & 0x10000000000000L) != 0L) {
- return jjStartNfaWithStates_2(2, 52, 30);
+ return jjStartNfaWithStates_2(2, 40, 16);
+ } else if ((active0 & 0x8000000000000L) != 0L) {
+ return jjStartNfaWithStates_2(2, 51, 16);
}
break;
case 108:
return jjMoveStringLiteralDfa3_2(active0, 0x18000L);
case 112:
return jjMoveStringLiteralDfa3_2(active0, 0x80000000000L);
- case 115:
- return jjMoveStringLiteralDfa3_2(active0, 0x100000000000L);
case 116:
if ((active0 & 0x4000000000L) != 0L) {
- return jjStartNfaWithStates_2(2, 38, 30);
+ return jjStartNfaWithStates_2(2, 38, 16);
}
break;
case 117:
return jjMoveStringLiteralDfa3_2(active0, 0x4000L);
case 118:
- if ((active0 & 0x4000000000000L) != 0L) {
- return jjStartNfaWithStates_2(2, 50, 30);
+ if ((active0 & 0x2000000000000L) != 0L) {
+ return jjStartNfaWithStates_2(2, 49, 16);
}
break;
default:
@@ -597,18 +555,18 @@ public class ELParserTokenManager implements
ELParserConstants {
switch (curChar) {
case 101:
if ((active0 & 0x4000L) != 0L) {
- return jjStartNfaWithStates_2(3, 14, 30);
+ return jjStartNfaWithStates_2(3, 14, 16);
}
break;
case 108:
if ((active0 & 0x10000L) != 0L) {
- return jjStartNfaWithStates_2(3, 16, 30);
+ return jjStartNfaWithStates_2(3, 16, 16);
}
break;
case 115:
return jjMoveStringLiteralDfa4_2(active0, 0x8000L);
case 116:
- return jjMoveStringLiteralDfa4_2(active0, 0x180000000000L);
+ return jjMoveStringLiteralDfa4_2(active0, 0x80000000000L);
default:
break;
}
@@ -626,16 +584,14 @@ public class ELParserTokenManager implements
ELParserConstants {
return 4;
}
switch (curChar) {
- case 97:
- return jjMoveStringLiteralDfa5_2(active0, 0x100000000000L);
case 101:
if ((active0 & 0x8000L) != 0L) {
- return jjStartNfaWithStates_2(4, 15, 30);
+ return jjStartNfaWithStates_2(4, 15, 16);
}
break;
case 121:
if ((active0 & 0x80000000000L) != 0L) {
- return jjStartNfaWithStates_2(4, 43, 30);
+ return jjStartNfaWithStates_2(4, 43, 16);
}
break;
default:
@@ -644,104 +600,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);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_2(4, active0);
- return 5;
- }
- switch (curChar) {
- case 110:
- return jjMoveStringLiteralDfa6_2(active0, 0x100000000000L);
- default:
- break;
- }
- return jjStartNfa_2(4, active0);
- }
-
- private int jjMoveStringLiteralDfa6_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
- return jjStartNfa_2(4, old0);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_2(5, active0);
- return 6;
- }
- switch (curChar) {
- case 99:
- return jjMoveStringLiteralDfa7_2(active0, 0x100000000000L);
- default:
- break;
- }
- return jjStartNfa_2(5, active0);
- }
-
- private int jjMoveStringLiteralDfa7_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
- return jjStartNfa_2(5, old0);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_2(6, active0);
- return 7;
- }
- switch (curChar) {
- case 101:
- return jjMoveStringLiteralDfa8_2(active0, 0x100000000000L);
- default:
- break;
- }
- return jjStartNfa_2(6, active0);
- }
-
- private int jjMoveStringLiteralDfa8_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
- return jjStartNfa_2(6, old0);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_2(7, active0);
- return 8;
- }
- switch (curChar) {
- case 111:
- return jjMoveStringLiteralDfa9_2(active0, 0x100000000000L);
- default:
- break;
- }
- return jjStartNfa_2(7, active0);
- }
-
- private int jjMoveStringLiteralDfa9_2(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
- return jjStartNfa_2(7, old0);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_2(8, active0);
- return 9;
- }
- switch (curChar) {
- case 102:
- if ((active0 & 0x100000000000L) != 0L) {
- return jjStartNfaWithStates_2(9, 44, 30);
- }
- break;
- default:
- break;
- }
- return jjStartNfa_2(8, active0);
- }
-
private int jjStartNfaWithStates_2(int pos, int kind, int state) {
jjmatchedKind = kind;
jjmatchedPos = pos;
@@ -870,7 +728,7 @@ public class ELParserTokenManager implements
ELParserConstants {
private int jjMoveNfa_2(int startState, int curPos) {
int startsAt = 0;
- jjnewStateCnt = 30;
+ jjnewStateCnt = 29;
int i = 1;
jjstateSet[0] = startState;
int kind = 0x7fffffff;
@@ -891,11 +749,11 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAddStates(18, 22);
}
} else if (curChar == 36) {
- if (kind > 56) {
- kind = 56;
+ if (kind > 55) {
+ kind = 55;
}
{
- jjCheckNAddTwoStates(28, 29);
+ jjCheckNAdd(16);
}
} else if (curChar == 39) {
jjCheckNAddStates(23, 25);
@@ -905,24 +763,6 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAdd(1);
}
break;
- case 30:
- if ((0x3ff00100fffc1ffL & l) != 0L) {
- if (kind > 57) {
- kind = 57;
- }
- {
- jjCheckNAdd(29);
- }
- }
- if ((0x3ff00100fffc1ffL & l) != 0L) {
- if (kind > 56) {
- kind = 56;
- }
- {
- jjCheckNAdd(28);
- }
- }
- break;
case 1:
if ((0x3ff000000000000L & l) == 0L) {
break;
@@ -989,6 +829,26 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 15:
+ if (curChar != 36) {
+ break;
+ }
+ if (kind > 55) {
+ kind = 55;
+ } {
+ jjCheckNAdd(16);
+ }
+ break;
+ case 16:
+ if ((0x3ff00100fffc1ffL & l) == 0L) {
+ break;
+ }
+ if (kind > 55) {
+ kind = 55;
+ } {
+ jjCheckNAdd(16);
+ }
+ break;
+ case 17:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
@@ -998,106 +858,76 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAddStates(18, 22);
}
break;
- case 16:
+ case 18:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
if (kind > 10) {
kind = 10;
} {
- jjCheckNAdd(16);
+ jjCheckNAdd(18);
}
break;
- case 17:
+ case 19:
if ((0x3ff000000000000L & l) != 0L) {
- jjCheckNAddTwoStates(17, 18);
+ jjCheckNAddTwoStates(19, 20);
}
break;
- case 18:
+ case 20:
if (curChar != 46) {
break;
}
if (kind > 11) {
kind = 11;
} {
- jjCheckNAddTwoStates(19, 20);
+ jjCheckNAddTwoStates(21, 22);
}
break;
- case 19:
+ case 21:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
if (kind > 11) {
kind = 11;
} {
- jjCheckNAddTwoStates(19, 20);
+ jjCheckNAddTwoStates(21, 22);
}
break;
- case 21:
+ case 23:
if ((0x280000000000L & l) != 0L) {
- jjCheckNAdd(22);
+ jjCheckNAdd(24);
}
break;
- case 22:
+ case 24:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
if (kind > 11) {
kind = 11;
} {
- jjCheckNAdd(22);
+ jjCheckNAdd(24);
}
break;
- case 23:
+ case 25:
if ((0x3ff000000000000L & l) != 0L) {
- jjCheckNAddTwoStates(23, 24);
+ jjCheckNAddTwoStates(25, 26);
}
break;
- case 25:
+ case 27:
if ((0x280000000000L & l) != 0L) {
- jjCheckNAdd(26);
+ jjCheckNAdd(28);
}
break;
- case 26:
+ case 28:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
if (kind > 11) {
kind = 11;
} {
- jjCheckNAdd(26);
- }
- break;
- case 27:
- if (curChar != 36) {
- break;
- }
- if (kind > 56) {
- kind = 56;
- } {
- jjCheckNAddTwoStates(28, 29);
- }
- break;
- case 28:
- if ((0x3ff00100fffc1ffL & l) == 0L) {
- break;
- }
- if (kind > 56) {
- kind = 56;
- } {
jjCheckNAdd(28);
}
break;
- case 29:
- if ((0x3ff00100fffc1ffL & l) == 0L) {
- break;
- }
- if (kind > 57) {
- kind = 57;
- } {
- jjCheckNAdd(29);
- }
- break;
default:
break;
}
@@ -1110,30 +940,12 @@ public class ELParserTokenManager implements
ELParserConstants {
if ((0x7fffffe87fffffeL & l) == 0L) {
break;
}
- if (kind > 56) {
- kind = 56;
+ if (kind > 55) {
+ kind = 55;
} {
- jjCheckNAddTwoStates(28, 29);
+ jjCheckNAdd(16);
}
break;
- case 30:
- if ((0x87fffffe87fffffeL & l) != 0L) {
- if (kind > 57) {
- kind = 57;
- }
- {
- jjCheckNAdd(29);
- }
- }
- if ((0x87fffffe87fffffeL & l) != 0L) {
- if (kind > 56) {
- kind = 56;
- }
- {
- jjCheckNAdd(28);
- }
- }
- break;
case 2:
if ((0x2000000020L & l) != 0L) {
jjAddStates(29, 30);
@@ -1169,35 +981,25 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAddStates(23, 25);
}
break;
- case 20:
- if ((0x2000000020L & l) != 0L) {
- jjAddStates(31, 32);
- }
- break;
- case 24:
- if ((0x2000000020L & l) != 0L) {
- jjAddStates(33, 34);
- }
- break;
- case 28:
+ case 16:
if ((0x87fffffe87fffffeL & l) == 0L) {
break;
}
- if (kind > 56) {
- kind = 56;
+ if (kind > 55) {
+ kind = 55;
} {
- jjCheckNAdd(28);
+ jjCheckNAdd(16);
}
break;
- case 29:
- if ((0x87fffffe87fffffeL & l) == 0L) {
- break;
+ case 22:
+ if ((0x2000000020L & l) != 0L) {
+ jjAddStates(31, 32);
+ }
+ break;
+ case 26:
+ if ((0x2000000020L & l) != 0L) {
+ jjAddStates(33, 34);
}
- if (kind > 57) {
- kind = 57;
- } {
- jjCheckNAdd(29);
- }
break;
default:
break;
@@ -1215,30 +1017,12 @@ public class ELParserTokenManager implements
ELParserConstants {
if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
break;
}
- if (kind > 56) {
- kind = 56;
+ if (kind > 55) {
+ kind = 55;
} {
- jjCheckNAddTwoStates(28, 29);
+ jjCheckNAdd(16);
}
break;
- case 30:
- if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {
- if (kind > 56) {
- kind = 56;
- }
- {
- jjCheckNAdd(28);
- }
- }
- if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {
- if (kind > 57) {
- kind = 57;
- }
- {
- jjCheckNAdd(29);
- }
- }
- break;
case 6:
if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjAddStates(26, 28);
@@ -1249,24 +1033,14 @@ public class ELParserTokenManager implements
ELParserConstants {
jjAddStates(23, 25);
}
break;
- case 28:
- if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) {
- break;
- }
- if (kind > 56) {
- kind = 56;
- } {
- jjCheckNAdd(28);
- }
- break;
- case 29:
+ case 16:
if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) {
break;
}
- if (kind > 57) {
- kind = 57;
+ if (kind > 55) {
+ kind = 55;
} {
- jjCheckNAdd(29);
+ jjCheckNAdd(16);
}
break;
default:
@@ -1284,7 +1058,7 @@ public class ELParserTokenManager implements
ELParserConstants {
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 30 - (jjnewStateCnt =
startsAt))) {
+ if ((i = jjnewStateCnt) == (startsAt = 29 - (jjnewStateCnt =
startsAt))) {
return curPos;
}
try {
@@ -1301,77 +1075,39 @@ public class ELParserTokenManager implements
ELParserConstants {
if ((active0 & 0x20000L) != 0L) {
return 1;
}
- if ((active0 & 0x141d555401c000L) != 0L) {
- jjmatchedKind = 56;
- return 30;
+ if ((active0 & 0xa0d555401c000L) != 0L) {
+ jjmatchedKind = 55;
+ return 16;
}
return -1;
case 1:
- if ((active0 & 0x41554000000L) != 0L) {
- return 30;
- }
- if ((active0 & 0x1419400001c000L) != 0L) {
- jjmatchedKind = 56;
+ if ((active0 & 0xa09400001c000L) != 0L) {
+ jjmatchedKind = 55;
jjmatchedPos = 1;
- return 30;
+ return 16;
+ }
+ if ((active0 & 0x41554000000L) != 0L) {
+ return 16;
}
return -1;
case 2:
- if ((active0 & 0x14014000000000L) != 0L) {
- return 30;
+ if ((active0 & 0xa014000000000L) != 0L) {
+ return 16;
}
- if ((active0 & 0x18000001c000L) != 0L) {
- jjmatchedKind = 56;
+ if ((active0 & 0x8000001c000L) != 0L) {
+ jjmatchedKind = 55;
jjmatchedPos = 2;
- return 30;
+ return 16;
}
return -1;
case 3:
if ((active0 & 0x14000L) != 0L) {
- return 30;
+ return 16;
}
- if ((active0 & 0x180000008000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 3;
- return 30;
- }
- return -1;
- case 4:
if ((active0 & 0x80000008000L) != 0L) {
- return 30;
- }
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 4;
- return 30;
- }
- return -1;
- case 5:
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 5;
- return 30;
- }
- return -1;
- case 6:
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 6;
- return 30;
- }
- return -1;
- case 7:
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 7;
- return 30;
- }
- return -1;
- case 8:
- if ((active0 & 0x100000000000L) != 0L) {
- jjmatchedKind = 56;
- jjmatchedPos = 8;
- return 30;
+ jjmatchedKind = 55;
+ jjmatchedPos = 3;
+ return 16;
}
return -1;
default:
@@ -1389,7 +1125,7 @@ public class ELParserTokenManager implements
ELParserConstants {
jjmatchedKind = 37;
return jjMoveStringLiteralDfa1_1(0x800000000L);
case 37:
- return jjStopAtPos(0, 51);
+ return jjStopAtPos(0, 50);
case 38:
return jjMoveStringLiteralDfa1_1(0x8000000000L);
case 40:
@@ -1397,19 +1133,19 @@ public class ELParserTokenManager implements
ELParserConstants {
case 41:
return jjStopAtPos(0, 19);
case 42:
- return jjStopAtPos(0, 45);
+ return jjStopAtPos(0, 44);
case 43:
- jjmatchedKind = 46;
- return jjMoveStringLiteralDfa1_1(0x20000000000000L);
+ jjmatchedKind = 45;
+ return jjMoveStringLiteralDfa1_1(0x10000000000000L);
case 44:
return jjStopAtPos(0, 24);
case 45:
- jjmatchedKind = 47;
- return jjMoveStringLiteralDfa1_1(0x80000000000000L);
+ jjmatchedKind = 46;
+ return jjMoveStringLiteralDfa1_1(0x40000000000000L);
case 46:
return jjStartNfaWithStates_1(0, 17, 1);
case 47:
- return jjStopAtPos(0, 49);
+ return jjStopAtPos(0, 48);
case 58:
return jjStopAtPos(0, 22);
case 59:
@@ -1418,13 +1154,13 @@ public class ELParserTokenManager implements
ELParserConstants {
jjmatchedKind = 27;
return jjMoveStringLiteralDfa1_1(0x80000000L);
case 61:
- jjmatchedKind = 54;
+ jjmatchedKind = 53;
return jjMoveStringLiteralDfa1_1(0x200000000L);
case 62:
jjmatchedKind = 25;
return jjMoveStringLiteralDfa1_1(0x20000000L);
case 63:
- return jjStopAtPos(0, 48);
+ return jjStopAtPos(0, 47);
case 91:
return jjStopAtPos(0, 20);
case 93:
@@ -1432,19 +1168,17 @@ public class ELParserTokenManager implements
ELParserConstants {
case 97:
return jjMoveStringLiteralDfa1_1(0x10000000000L);
case 100:
- return jjMoveStringLiteralDfa1_1(0x4000000000000L);
+ return jjMoveStringLiteralDfa1_1(0x2000000000000L);
case 101:
return jjMoveStringLiteralDfa1_1(0x80400000000L);
case 102:
return jjMoveStringLiteralDfa1_1(0x8000L);
case 103:
return jjMoveStringLiteralDfa1_1(0x44000000L);
- case 105:
- return jjMoveStringLiteralDfa1_1(0x100000000000L);
case 108:
return jjMoveStringLiteralDfa1_1(0x110000000L);
case 109:
- return jjMoveStringLiteralDfa1_1(0x10000000000000L);
+ return jjMoveStringLiteralDfa1_1(0x8000000000000L);
case 110:
return jjMoveStringLiteralDfa1_1(0x5000010000L);
case 111:
@@ -1484,49 +1218,49 @@ public class ELParserTokenManager implements
ELParserConstants {
return jjStopAtPos(1, 33);
} else if ((active0 & 0x800000000L) != 0L) {
return jjStopAtPos(1, 35);
- } else if ((active0 & 0x20000000000000L) != 0L) {
- return jjStopAtPos(1, 53);
+ } else if ((active0 & 0x10000000000000L) != 0L) {
+ return jjStopAtPos(1, 52);
}
break;
case 62:
- if ((active0 & 0x80000000000000L) != 0L) {
- return jjStopAtPos(1, 55);
+ if ((active0 & 0x40000000000000L) != 0L) {
+ return jjStopAtPos(1, 54);
}
break;
case 97:
return jjMoveStringLiteralDfa2_1(active0, 0x8000L);
case 101:
if ((active0 & 0x40000000L) != 0L) {
- return jjStartNfaWithStates_1(1, 30, 30);
+ return jjStartNfaWithStates_1(1, 30, 16);
} else if ((active0 & 0x100000000L) != 0L) {
- return jjStartNfaWithStates_1(1, 32, 30);
+ return jjStartNfaWithStates_1(1, 32, 16);
} else if ((active0 & 0x1000000000L) != 0L) {
- return jjStartNfaWithStates_1(1, 36, 30);
+ return jjStartNfaWithStates_1(1, 36, 16);
}
break;
case 105:
- return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000L);
case 109:
return jjMoveStringLiteralDfa2_1(active0, 0x80000000000L);
case 110:
- return jjMoveStringLiteralDfa2_1(active0, 0x110000000000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x10000000000L);
case 111:
- return jjMoveStringLiteralDfa2_1(active0, 0x10004000000000L);
+ return jjMoveStringLiteralDfa2_1(active0, 0x8004000000000L);
case 113:
if ((active0 & 0x400000000L) != 0L) {
- return jjStartNfaWithStates_1(1, 34, 30);
+ return jjStartNfaWithStates_1(1, 34, 16);
}
break;
case 114:
if ((active0 & 0x40000000000L) != 0L) {
- return jjStartNfaWithStates_1(1, 42, 30);
+ return jjStartNfaWithStates_1(1, 42, 16);
}
return jjMoveStringLiteralDfa2_1(active0, 0x4000L);
case 116:
if ((active0 & 0x4000000L) != 0L) {
- return jjStartNfaWithStates_1(1, 26, 30);
+ return jjStartNfaWithStates_1(1, 26, 16);
} else if ((active0 & 0x10000000L) != 0L) {
- return jjStartNfaWithStates_1(1, 28, 30);
+ return jjStartNfaWithStates_1(1, 28, 16);
}
break;
case 117:
@@ -1555,27 +1289,25 @@ public class ELParserTokenManager implements
ELParserConstants {
switch (curChar) {
case 100:
if ((active0 & 0x10000000000L) != 0L) {
- return jjStartNfaWithStates_1(2, 40, 30);
- } else if ((active0 & 0x10000000000000L) != 0L) {
- return jjStartNfaWithStates_1(2, 52, 30);
+ return jjStartNfaWithStates_1(2, 40, 16);
+ } else if ((active0 & 0x8000000000000L) != 0L) {
+ return jjStartNfaWithStates_1(2, 51, 16);
}
break;
case 108:
return jjMoveStringLiteralDfa3_1(active0, 0x18000L);
case 112:
return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L);
- case 115:
- return jjMoveStringLiteralDfa3_1(active0, 0x100000000000L);
case 116:
if ((active0 & 0x4000000000L) != 0L) {
- return jjStartNfaWithStates_1(2, 38, 30);
+ return jjStartNfaWithStates_1(2, 38, 16);
}
break;
case 117:
return jjMoveStringLiteralDfa3_1(active0, 0x4000L);
case 118:
- if ((active0 & 0x4000000000000L) != 0L) {
- return jjStartNfaWithStates_1(2, 50, 30);
+ if ((active0 & 0x2000000000000L) != 0L) {
+ return jjStartNfaWithStates_1(2, 49, 16);
}
break;
default:
@@ -1597,18 +1329,18 @@ public class ELParserTokenManager implements
ELParserConstants {
switch (curChar) {
case 101:
if ((active0 & 0x4000L) != 0L) {
- return jjStartNfaWithStates_1(3, 14, 30);
+ return jjStartNfaWithStates_1(3, 14, 16);
}
break;
case 108:
if ((active0 & 0x10000L) != 0L) {
- return jjStartNfaWithStates_1(3, 16, 30);
+ return jjStartNfaWithStates_1(3, 16, 16);
}
break;
case 115:
return jjMoveStringLiteralDfa4_1(active0, 0x8000L);
case 116:
- return jjMoveStringLiteralDfa4_1(active0, 0x180000000000L);
+ return jjMoveStringLiteralDfa4_1(active0, 0x80000000000L);
default:
break;
}
@@ -1626,16 +1358,14 @@ public class ELParserTokenManager implements
ELParserConstants {
return 4;
}
switch (curChar) {
- case 97:
- return jjMoveStringLiteralDfa5_1(active0, 0x100000000000L);
case 101:
if ((active0 & 0x8000L) != 0L) {
- return jjStartNfaWithStates_1(4, 15, 30);
+ return jjStartNfaWithStates_1(4, 15, 16);
}
break;
case 121:
if ((active0 & 0x80000000000L) != 0L) {
- return jjStartNfaWithStates_1(4, 43, 30);
+ return jjStartNfaWithStates_1(4, 43, 16);
}
break;
default:
@@ -1644,104 +1374,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);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_1(4, active0);
- return 5;
- }
- switch (curChar) {
- case 110:
- return jjMoveStringLiteralDfa6_1(active0, 0x100000000000L);
- default:
- break;
- }
- return jjStartNfa_1(4, active0);
- }
-
- private int jjMoveStringLiteralDfa6_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
- return jjStartNfa_1(4, old0);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_1(5, active0);
- return 6;
- }
- switch (curChar) {
- case 99:
- return jjMoveStringLiteralDfa7_1(active0, 0x100000000000L);
- default:
- break;
- }
- return jjStartNfa_1(5, active0);
- }
-
- private int jjMoveStringLiteralDfa7_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
- return jjStartNfa_1(5, old0);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_1(6, active0);
- return 7;
- }
- switch (curChar) {
- case 101:
- return jjMoveStringLiteralDfa8_1(active0, 0x100000000000L);
- default:
- break;
- }
- return jjStartNfa_1(6, active0);
- }
-
- private int jjMoveStringLiteralDfa8_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
- return jjStartNfa_1(6, old0);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_1(7, active0);
- return 8;
- }
- switch (curChar) {
- case 111:
- return jjMoveStringLiteralDfa9_1(active0, 0x100000000000L);
- default:
- break;
- }
- return jjStartNfa_1(7, active0);
- }
-
- private int jjMoveStringLiteralDfa9_1(long old0, long active0) {
- if (((active0 &= old0)) == 0L) {
- return jjStartNfa_1(7, old0);
- }
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- jjStopStringLiteralDfa_1(8, active0);
- return 9;
- }
- switch (curChar) {
- case 102:
- if ((active0 & 0x100000000000L) != 0L) {
- return jjStartNfaWithStates_1(9, 44, 30);
- }
- break;
- default:
- break;
- }
- return jjStartNfa_1(8, active0);
- }
-
private int jjStartNfaWithStates_1(int pos, int kind, int state) {
jjmatchedKind = kind;
jjmatchedPos = pos;
@@ -1755,7 +1387,7 @@ public class ELParserTokenManager implements
ELParserConstants {
private int jjMoveNfa_1(int startState, int curPos) {
int startsAt = 0;
- jjnewStateCnt = 30;
+ jjnewStateCnt = 29;
int i = 1;
jjstateSet[0] = startState;
int kind = 0x7fffffff;
@@ -1776,11 +1408,11 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAddStates(18, 22);
}
} else if (curChar == 36) {
- if (kind > 56) {
- kind = 56;
+ if (kind > 55) {
+ kind = 55;
}
{
- jjCheckNAddTwoStates(28, 29);
+ jjCheckNAdd(16);
}
} else if (curChar == 39) {
jjCheckNAddStates(23, 25);
@@ -1790,24 +1422,6 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAdd(1);
}
break;
- case 30:
- if ((0x3ff00100fffc1ffL & l) != 0L) {
- if (kind > 57) {
- kind = 57;
- }
- {
- jjCheckNAdd(29);
- }
- }
- if ((0x3ff00100fffc1ffL & l) != 0L) {
- if (kind > 56) {
- kind = 56;
- }
- {
- jjCheckNAdd(28);
- }
- }
- break;
case 1:
if ((0x3ff000000000000L & l) == 0L) {
break;
@@ -1874,6 +1488,26 @@ public class ELParserTokenManager implements
ELParserConstants {
}
break;
case 15:
+ if (curChar != 36) {
+ break;
+ }
+ if (kind > 55) {
+ kind = 55;
+ } {
+ jjCheckNAdd(16);
+ }
+ break;
+ case 16:
+ if ((0x3ff00100fffc1ffL & l) == 0L) {
+ break;
+ }
+ if (kind > 55) {
+ kind = 55;
+ } {
+ jjCheckNAdd(16);
+ }
+ break;
+ case 17:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
@@ -1883,106 +1517,76 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAddStates(18, 22);
}
break;
- case 16:
+ case 18:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
if (kind > 10) {
kind = 10;
} {
- jjCheckNAdd(16);
+ jjCheckNAdd(18);
}
break;
- case 17:
+ case 19:
if ((0x3ff000000000000L & l) != 0L) {
- jjCheckNAddTwoStates(17, 18);
+ jjCheckNAddTwoStates(19, 20);
}
break;
- case 18:
+ case 20:
if (curChar != 46) {
break;
}
if (kind > 11) {
kind = 11;
} {
- jjCheckNAddTwoStates(19, 20);
+ jjCheckNAddTwoStates(21, 22);
}
break;
- case 19:
+ case 21:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
if (kind > 11) {
kind = 11;
} {
- jjCheckNAddTwoStates(19, 20);
+ jjCheckNAddTwoStates(21, 22);
}
break;
- case 21:
+ case 23:
if ((0x280000000000L & l) != 0L) {
- jjCheckNAdd(22);
+ jjCheckNAdd(24);
}
break;
- case 22:
+ case 24:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
if (kind > 11) {
kind = 11;
} {
- jjCheckNAdd(22);
+ jjCheckNAdd(24);
}
break;
- case 23:
+ case 25:
if ((0x3ff000000000000L & l) != 0L) {
- jjCheckNAddTwoStates(23, 24);
+ jjCheckNAddTwoStates(25, 26);
}
break;
- case 25:
+ case 27:
if ((0x280000000000L & l) != 0L) {
- jjCheckNAdd(26);
+ jjCheckNAdd(28);
}
break;
- case 26:
+ case 28:
if ((0x3ff000000000000L & l) == 0L) {
break;
}
if (kind > 11) {
kind = 11;
} {
- jjCheckNAdd(26);
- }
- break;
- case 27:
- if (curChar != 36) {
- break;
- }
- if (kind > 56) {
- kind = 56;
- } {
- jjCheckNAddTwoStates(28, 29);
- }
- break;
- case 28:
- if ((0x3ff00100fffc1ffL & l) == 0L) {
- break;
- }
- if (kind > 56) {
- kind = 56;
- } {
jjCheckNAdd(28);
}
break;
- case 29:
- if ((0x3ff00100fffc1ffL & l) == 0L) {
- break;
- }
- if (kind > 57) {
- kind = 57;
- } {
- jjCheckNAdd(29);
- }
- break;
default:
break;
}
@@ -1995,30 +1599,12 @@ public class ELParserTokenManager implements
ELParserConstants {
if ((0x7fffffe87fffffeL & l) == 0L) {
break;
}
- if (kind > 56) {
- kind = 56;
+ if (kind > 55) {
+ kind = 55;
} {
- jjCheckNAddTwoStates(28, 29);
+ jjCheckNAdd(16);
}
break;
- case 30:
- if ((0x87fffffe87fffffeL & l) != 0L) {
- if (kind > 57) {
- kind = 57;
- }
- {
- jjCheckNAdd(29);
- }
- }
- if ((0x87fffffe87fffffeL & l) != 0L) {
- if (kind > 56) {
- kind = 56;
- }
- {
- jjCheckNAdd(28);
- }
- }
- break;
case 2:
if ((0x2000000020L & l) != 0L) {
jjAddStates(29, 30);
@@ -2054,35 +1640,25 @@ public class ELParserTokenManager implements
ELParserConstants {
jjCheckNAddStates(23, 25);
}
break;
- case 20:
- if ((0x2000000020L & l) != 0L) {
- jjAddStates(31, 32);
- }
- break;
- case 24:
- if ((0x2000000020L & l) != 0L) {
- jjAddStates(33, 34);
- }
- break;
- case 28:
+ case 16:
if ((0x87fffffe87fffffeL & l) == 0L) {
break;
}
- if (kind > 56) {
- kind = 56;
+ if (kind > 55) {
+ kind = 55;
} {
- jjCheckNAdd(28);
+ jjCheckNAdd(16);
}
break;
- case 29:
- if ((0x87fffffe87fffffeL & l) == 0L) {
- break;
+ case 22:
+ if ((0x2000000020L & l) != 0L) {
+ jjAddStates(31, 32);
+ }
+ break;
+ case 26:
+ if ((0x2000000020L & l) != 0L) {
+ jjAddStates(33, 34);
}
- if (kind > 57) {
- kind = 57;
- } {
- jjCheckNAdd(29);
- }
break;
default:
break;
@@ -2100,30 +1676,12 @@ public class ELParserTokenManager implements
ELParserConstants {
if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
break;
}
- if (kind > 56) {
- kind = 56;
+ if (kind > 55) {
+ kind = 55;
} {
- jjCheckNAddTwoStates(28, 29);
+ jjCheckNAdd(16);
}
break;
- case 30:
- if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {
- if (kind > 56) {
- kind = 56;
- }
- {
- jjCheckNAdd(28);
- }
- }
- if (jjCanMove_2(hiByte, i1, i2, l1, l2)) {
- if (kind > 57) {
- kind = 57;
- }
- {
- jjCheckNAdd(29);
- }
- }
- break;
case 6:
if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjAddStates(26, 28);
@@ -2134,24 +1692,14 @@ public class ELParserTokenManager implements
ELParserConstants {
jjAddStates(23, 25);
}
break;
- case 28:
- if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) {
- break;
- }
- if (kind > 56) {
- kind = 56;
- } {
- jjCheckNAdd(28);
- }
- break;
- case 29:
+ case 16:
if (!jjCanMove_2(hiByte, i1, i2, l1, l2)) {
break;
}
- if (kind > 57) {
- kind = 57;
+ if (kind > 55) {
+ kind = 55;
} {
- jjCheckNAdd(29);
+ jjCheckNAdd(16);
}
break;
default:
@@ -2169,7 +1717,7 @@ public class ELParserTokenManager implements
ELParserConstants {
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 30 - (jjnewStateCnt =
startsAt))) {
+ if ((i = jjnewStateCnt) == (startsAt = 29 - (jjnewStateCnt =
startsAt))) {
return curPos;
}
try {
@@ -2185,9 +1733,8 @@ public class ELParserTokenManager implements
ELParserConstants {
"\175", null, null, null, null, "\164\162\165\145",
"\146\141\154\163\145", "\156\165\154\154", "\56",
"\50", "\51", "\133", "\135", "\72", "\73", "\54", "\76",
"\147\164", "\74", "\154\164", "\76\75",
"\147\145", "\74\75", "\154\145", "\75\75", "\145\161", "\41\75",
"\156\145", "\41", "\156\157\164",
- "\46\46", "\141\156\144", "\174\174", "\157\162",
"\145\155\160\164\171",
- "\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, };
+ "\46\46", "\141\156\144", "\174\174", "\157\162",
"\145\155\160\164\171", "\52", "\53", "\55", "\77", "\57",
+ "\144\151\166", "\45", "\155\157\144", "\53\75", "\75", "\55\76",
null, null, null, null, };
protected Token jjFillToken() {
final Token t;
@@ -2212,8 +1759,8 @@ 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, };
+ static final int[] jjnextStates = { 0, 1, 3, 4, 2, 0, 1, 4, 2, 0, 1, 4, 5,
2, 0, 1, 2, 6, 18, 19, 20, 25, 26, 11,
+ 12, 14, 6, 7, 9, 3, 4, 23, 24, 27, 28, };
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long
l1, long l2) {
switch (hiByte) {
@@ -2491,8 +2038,8 @@ public class ELParserTokenManager implements
ELParserConstants {
jjmatchedKind = 0x7fffffff;
jjmatchedPos = 0;
curPos = jjMoveStringLiteralDfa0_1();
- if (jjmatchedPos == 0 && jjmatchedKind > 60) {
- jjmatchedKind = 60;
+ if (jjmatchedPos == 0 && jjmatchedKind > 58) {
+ jjmatchedKind = 58;
}
break;
case 2:
@@ -2507,8 +2054,8 @@ public class ELParserTokenManager implements
ELParserConstants {
jjmatchedKind = 0x7fffffff;
jjmatchedPos = 0;
curPos = jjMoveStringLiteralDfa0_2();
- if (jjmatchedPos == 0 && jjmatchedKind > 60) {
- jjmatchedKind = 60;
+ if (jjmatchedPos == 0 && jjmatchedKind > 58) {
+ jjmatchedKind = 58;
}
break;
}
@@ -2652,7 +2199,7 @@ public class ELParserTokenManager implements
ELParserConstants {
private void ReInitRounds() {
int i;
jjround = 0x80000001;
- for (i = 30; i-- > 0;) {
+ for (i = 29; i-- > 0;) {
jjrounds[i] = 0x80000000;
}
}
@@ -2682,15 +2229,15 @@ public class ELParserTokenManager implements
ELParserConstants {
/** Lex State array. */
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, };
- static final long[] jjtoToken = { 0x13ffffffffffef0fL, };
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, };
+ static final long[] jjtoToken = { 0x4ffffffffffef0fL, };
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 int[] jjrounds = new int[29];
+ private final int[] jjstateSet = new int[2 * 29];
private final StringBuilder jjimage = new StringBuilder();
private StringBuilder image = jjimage;
private int jjimageLen;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 231bc6d0f1..de4d68da33 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,10 @@
Remove <code>IMPL_OBJ_START</code> from EL grammar for
<code>IDENTIFIER</code>. (markt)
</scode>
+ <scode>
+ Remove the <code>INSTANCEOF</code> and <code>FUNCTIONSUFFIX</code>
+ definitions from the EL grammar as both are unused. (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
