This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 5ba377b5a42c07290223297234f1997e1b88ca1f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 26 16:39:35 2024 +0100
Update generated code for 'not empty' optimisation
---
java/org/apache/el/parser/ELParser.java | 853 ++++++++++++---------
.../apache/el/parser/ELParserTreeConstants.java | 45 +-
2 files changed, 497 insertions(+), 401 deletions(-)
diff --git a/java/org/apache/el/parser/ELParser.java
b/java/org/apache/el/parser/ELParser.java
index 06c07abe13..e18120242c 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -1552,117 +1552,175 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
}
break;
}
- case NOT0:
- case NOT1: {
- switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
- case NOT0: {
- jj_consume_token(NOT0);
- break;
- }
- case NOT1: {
- jj_consume_token(NOT1);
- break;
- }
- default:
- jj_la1[33] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- AstNot jjtn002 = new AstNot(JJTNOT);
- boolean jjtc002 = true;
- jjtree.openNodeScope(jjtn002);
- try {
- Unary();
- } catch (Throwable jjte002) {
- if (jjtc002) {
- jjtree.clearNodeScope(jjtn002);
- jjtc002 = false;
- } else {
- jjtree.popNode();
+ default:
+ jj_la1[35] = jj_gen;
+ if (jj_2_6(2)) {
+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT0: {
+ jj_consume_token(NOT0);
+ break;
+ }
+ case NOT1: {
+ jj_consume_token(NOT1);
+ break;
+ }
+ default:
+ jj_la1[33] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
- if (jjte002 instanceof RuntimeException) {
- {
- if (true) {
- throw (RuntimeException) jjte002;
+ jj_consume_token(EMPTY);
+ AstNotEmpty jjtn002 = new AstNotEmpty(JJTNOTEMPTY);
+ boolean jjtc002 = true;
+ jjtree.openNodeScope(jjtn002);
+ try {
+ Unary();
+ } catch (Throwable jjte002) {
+ if (jjtc002) {
+ jjtree.clearNodeScope(jjtn002);
+ jjtc002 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte002 instanceof RuntimeException) {
+ {
+ if (true) {
+ throw (RuntimeException) jjte002;
+ }
+ }
+ }
+ if (jjte002 instanceof ParseException) {
+ {
+ if (true) {
+ throw (ParseException) jjte002;
+ }
}
}
- }
- if (jjte002 instanceof ParseException) {
{
if (true) {
- throw (ParseException) jjte002;
+ throw (Error) jjte002;
}
}
- }
- {
- if (true) {
- throw (Error) jjte002;
+ } finally {
+ if (jjtc002) {
+ jjtree.closeNodeScope(jjtn002, true);
}
}
- } finally {
- if (jjtc002) {
- jjtree.closeNodeScope(jjtn002, true);
- }
- }
- break;
- }
- case EMPTY: {
- jj_consume_token(EMPTY);
- AstEmpty jjtn003 = new AstEmpty(JJTEMPTY);
- boolean jjtc003 = true;
- jjtree.openNodeScope(jjtn003);
- try {
- Unary();
- } catch (Throwable jjte003) {
- if (jjtc003) {
- jjtree.clearNodeScope(jjtn003);
- jjtc003 = false;
- } else {
- jjtree.popNode();
- }
- if (jjte003 instanceof RuntimeException) {
- {
- if (true) {
- throw (RuntimeException) jjte003;
+ } else {
+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT0:
+ case NOT1: {
+ switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
+ case NOT0: {
+ jj_consume_token(NOT0);
+ break;
+ }
+ case NOT1: {
+ jj_consume_token(NOT1);
+ break;
+ }
+ default:
+ jj_la1[34] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
+ AstNot jjtn003 = new AstNot(JJTNOT);
+ boolean jjtc003 = true;
+ jjtree.openNodeScope(jjtn003);
+ try {
+ Unary();
+ } catch (Throwable jjte003) {
+ if (jjtc003) {
+ jjtree.clearNodeScope(jjtn003);
+ jjtc003 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte003 instanceof RuntimeException) {
+ {
+ if (true) {
+ throw (RuntimeException) jjte003;
+ }
+ }
+ }
+ if (jjte003 instanceof ParseException) {
+ {
+ if (true) {
+ throw (ParseException) jjte003;
+ }
+ }
+ }
+ {
+ if (true) {
+ throw (Error) jjte003;
+ }
+ }
+ } finally {
+ if (jjtc003) {
+ jjtree.closeNodeScope(jjtn003, true);
+ }
+ }
+ break;
}
- }
- if (jjte003 instanceof ParseException) {
- {
- if (true) {
- throw (ParseException) jjte003;
+ case EMPTY: {
+ jj_consume_token(EMPTY);
+ AstEmpty jjtn004 = new AstEmpty(JJTEMPTY);
+ boolean jjtc004 = true;
+ jjtree.openNodeScope(jjtn004);
+ try {
+ Unary();
+ } catch (Throwable jjte004) {
+ if (jjtc004) {
+ jjtree.clearNodeScope(jjtn004);
+ jjtc004 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte004 instanceof RuntimeException) {
+ {
+ if (true) {
+ throw (RuntimeException) jjte004;
+ }
+ }
+ }
+ if (jjte004 instanceof ParseException) {
+ {
+ if (true) {
+ throw (ParseException) jjte004;
+ }
+ }
+ }
+ {
+ if (true) {
+ throw (Error) jjte004;
+ }
+ }
+ } finally {
+ if (jjtc004) {
+ jjtree.closeNodeScope(jjtn004, true);
+ }
}
+ break;
}
- }
- {
- if (true) {
- throw (Error) jjte003;
+ case START_SET_OR_MAP:
+ case INTEGER_LITERAL:
+ case FLOATING_POINT_LITERAL:
+ case STRING_LITERAL:
+ case TRUE:
+ case FALSE:
+ case NULL:
+ case LPAREN:
+ case LBRACK:
+ case IDENTIFIER: {
+ Value();
+ break;
}
- }
- } finally {
- if (jjtc003) {
- jjtree.closeNodeScope(jjtn003, true);
+ default:
+ jj_la1[36] = jj_gen;
+ jj_consume_token(-1);
+ throw new ParseException();
}
}
- break;
- }
- case START_SET_OR_MAP:
- case INTEGER_LITERAL:
- case FLOATING_POINT_LITERAL:
- case STRING_LITERAL:
- case TRUE:
- case FALSE:
- case NULL:
- case LPAREN:
- case LBRACK:
- case IDENTIFIER: {
- Value();
- break;
- }
- default:
- jj_la1[34] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
}
}
@@ -1683,7 +1741,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[35] = jj_gen;
+ jj_la1[37] = jj_gen;
break label_14;
}
ValueSuffix();
@@ -1743,7 +1801,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[36] = jj_gen;
+ jj_la1[38] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1763,7 +1821,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[37] = jj_gen;
+ jj_la1[39] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1773,7 +1831,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[38] = jj_gen;
+ jj_la1[40] = jj_gen;
;
}
}
@@ -1875,7 +1933,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[39] = jj_gen;
+ jj_la1[41] = jj_gen;
break label_15;
}
jj_consume_token(COMMA);
@@ -1884,7 +1942,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[40] = jj_gen;
+ jj_la1[42] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -1925,7 +1983,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
* NonLiteral For Grouped Operations, Identifiers, and Functions
*/
final public void NonLiteral() throws ParseException {
- if (jj_2_6(5)) {
+ if (jj_2_7(5)) {
LambdaExpressionOrInvocation();
} else {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
@@ -1936,8 +1994,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[41] = jj_gen;
- if (jj_2_7(2147483647)) {
+ jj_la1[43] = jj_gen;
+ if (jj_2_8(2147483647)) {
Function();
} else {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
@@ -1946,8 +2004,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[42] = jj_gen;
- if (jj_2_8(5)) {
+ jj_la1[44] = jj_gen;
+ if (jj_2_9(5)) {
SetData();
} else {
switch ((jj_ntk == -1) ? jj_ntk_f() :
jj_ntk) {
@@ -1960,7 +2018,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[43] = jj_gen;
+ jj_la1[45] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2004,7 +2062,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[44] = jj_gen;
+ jj_la1[46] = jj_gen;
break label_16;
}
jj_consume_token(COMMA);
@@ -2013,7 +2071,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[45] = jj_gen;
+ jj_la1[47] = jj_gen;
;
}
jj_consume_token(RBRACE);
@@ -2079,7 +2137,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[46] = jj_gen;
+ jj_la1[48] = jj_gen;
break label_17;
}
jj_consume_token(COMMA);
@@ -2088,7 +2146,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[47] = jj_gen;
+ jj_la1[49] = jj_gen;
;
}
jj_consume_token(RBRACK);
@@ -2158,7 +2216,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[48] = jj_gen;
+ jj_la1[50] = jj_gen;
break label_18;
}
jj_consume_token(COMMA);
@@ -2167,7 +2225,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[49] = jj_gen;
+ jj_la1[51] = jj_gen;
;
}
jj_consume_token(RBRACE);
@@ -2283,7 +2341,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[50] = jj_gen;
+ jj_la1[52] = jj_gen;
;
}
if (t1 != null) {
@@ -2300,7 +2358,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[51] = jj_gen;
+ jj_la1[53] = jj_gen;
break label_19;
}
}
@@ -2364,7 +2422,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[52] = jj_gen;
+ jj_la1[54] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2402,7 +2460,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
break;
}
default:
- jj_la1[53] = jj_gen;
+ jj_la1[55] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2580,6 +2638,18 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
}
}
+ private boolean jj_2_9(int xla) {
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
+ try {
+ return (!jj_3_9());
+ } catch (LookaheadSuccess ls) {
+ return true;
+ } finally {
+ jj_save(8, xla);
+ }
+ }
+
private boolean jj_3R_LambdaExpressionOrInvocation_144_45_30() {
if (jj_3R_Choice_155_5_22()) {
return true;
@@ -2587,6 +2657,16 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
+ private boolean jj_3R_ListData_353_26_111() {
+ if (jj_scan_token(COMMA)) {
+ return true;
+ }
+ if (jj_3R_Expression_99_5_36()) {
+ return true;
+ }
+ return false;
+ }
+
private boolean jj_3R_Equality_182_5_40() {
if (jj_3R_Compare_196_5_45()) {
return true;
@@ -2602,8 +2682,11 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_ListData_350_26_111() {
- if (jj_scan_token(COMMA)) {
+ private boolean jj_3R_MapEntry_371_5_109() {
+ if (jj_3R_Expression_99_5_36()) {
+ return true;
+ }
+ if (jj_scan_token(COLON)) {
return true;
}
if (jj_3R_Expression_99_5_36()) {
@@ -2612,11 +2695,15 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_MapEntry_368_5_109() {
- if (jj_3R_Expression_99_5_36()) {
+ private boolean jj_3R_MapData_365_11_107() {
+ if (jj_3R_MapEntry_371_5_109()) {
return true;
}
- if (jj_scan_token(COLON)) {
+ return false;
+ }
+
+ private boolean jj_3R_SetData_346_26_37() {
+ if (jj_scan_token(COMMA)) {
return true;
}
if (jj_3R_Expression_99_5_36()) {
@@ -2625,8 +2712,16 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_MapData_362_11_107() {
- if (jj_3R_MapEntry_368_5_109()) {
+ private boolean jj_3R_MapData_364_5_101() {
+ if (jj_scan_token(START_SET_OR_MAP)) {
+ return true;
+ }
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_MapData_365_11_107()) {
+ jj_scanpos = xsp;
+ }
+ if (jj_scan_token(RBRACE)) {
return true;
}
return false;
@@ -2636,7 +2731,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
if (jj_scan_token(COMMA)) {
return true;
}
- if (jj_3R_Identifier_377_5_38()) {
+ if (jj_3R_Identifier_380_5_38()) {
return true;
}
return false;
@@ -2654,16 +2749,6 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_SetData_343_26_37() {
- if (jj_scan_token(COMMA)) {
- return true;
- }
- if (jj_3R_Expression_99_5_36()) {
- return true;
- }
- return false;
- }
-
private boolean jj_3R_Or_164_13_42() {
Token xsp;
xsp = jj_scanpos;
@@ -2694,29 +2779,14 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_MapData_361_5_101() {
- if (jj_scan_token(START_SET_OR_MAP)) {
- return true;
- }
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_MapData_362_11_107()) {
- jj_scanpos = xsp;
- }
- if (jj_scan_token(RBRACE)) {
- return true;
- }
- return false;
- }
-
- private boolean jj_3R_ListData_350_11_106() {
+ private boolean jj_3R_ListData_353_11_106() {
if (jj_3R_Expression_99_5_36()) {
return true;
}
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_ListData_350_26_111()) {
+ if (jj_3R_ListData_353_26_111()) {
jj_scanpos = xsp;
break;
}
@@ -2736,42 +2806,42 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3_5() {
- if (jj_scan_token(QUESTIONMARK)) {
+ private boolean jj_3R_ListData_352_5_100() {
+ if (jj_scan_token(LBRACK)) {
return true;
}
- if (jj_3R_Choice_155_5_22()) {
- return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_ListData_353_11_106()) {
+ jj_scanpos = xsp;
}
- if (jj_scan_token(COLON)) {
+ if (jj_scan_token(RBRACK)) {
return true;
}
return false;
}
- private boolean jj_3R_ListData_349_5_100() {
- if (jj_scan_token(LBRACK)) {
+ private boolean jj_3_5() {
+ if (jj_scan_token(QUESTIONMARK)) {
return true;
}
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_ListData_350_11_106()) {
- jj_scanpos = xsp;
+ if (jj_3R_Choice_155_5_22()) {
+ return true;
}
- if (jj_scan_token(RBRACK)) {
+ if (jj_scan_token(COLON)) {
return true;
}
return false;
}
- private boolean jj_3R_LambdaParameters_132_31_39() {
- if (jj_3R_Identifier_377_5_38()) {
+ private boolean jj_3R_SetData_346_11_31() {
+ if (jj_3R_Expression_99_5_36()) {
return true;
}
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_LambdaParameters_132_46_44()) {
+ if (jj_3R_SetData_346_26_37()) {
jj_scanpos = xsp;
break;
}
@@ -2779,14 +2849,14 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_SetData_343_11_31() {
- if (jj_3R_Expression_99_5_36()) {
+ private boolean jj_3R_LambdaParameters_132_31_39() {
+ if (jj_3R_Identifier_380_5_38()) {
return true;
}
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_SetData_343_26_37()) {
+ if (jj_3R_LambdaParameters_132_46_44()) {
jj_scanpos = xsp;
break;
}
@@ -2794,6 +2864,13 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
+ private boolean jj_3R_MethodParameters_320_31_113() {
+ if (jj_scan_token(COMMA)) {
+ return true;
+ }
+ return false;
+ }
+
private boolean jj_3R_Choice_155_5_22() {
if (jj_3R_Or_164_5_29()) {
return true;
@@ -2809,27 +2886,13 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3_3() {
- if (jj_3R_LambdaExpression_124_5_21()) {
- return true;
- }
- return false;
- }
-
- private boolean jj_3R_MethodParameters_317_31_113() {
- if (jj_scan_token(COMMA)) {
- return true;
- }
- return false;
- }
-
- private boolean jj_3R_SetData_342_5_25() {
+ private boolean jj_3R_SetData_345_5_25() {
if (jj_scan_token(START_SET_OR_MAP)) {
return true;
}
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_SetData_343_11_31()) {
+ if (jj_3R_SetData_346_11_31()) {
jj_scanpos = xsp;
}
if (jj_scan_token(RBRACE)) {
@@ -2838,14 +2901,14 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3_4() {
+ private boolean jj_3_3() {
if (jj_3R_LambdaExpression_124_5_21()) {
return true;
}
return false;
}
- private boolean jj_3R_null_328_18_24() {
+ private boolean jj_3R_null_331_18_24() {
if (jj_scan_token(IDENTIFIER)) {
return true;
}
@@ -2855,10 +2918,10 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3_7() {
+ private boolean jj_3_8() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_null_328_18_24()) {
+ if (jj_3R_null_331_18_24()) {
jj_scanpos = xsp;
}
if (jj_scan_token(IDENTIFIER)) {
@@ -2870,6 +2933,13 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
+ private boolean jj_3_4() {
+ if (jj_3R_LambdaExpression_124_5_21()) {
+ return true;
+ }
+ return false;
+ }
+
private boolean jj_3R_LambdaParameters_132_20_33() {
if (jj_scan_token(LPAREN)) {
return true;
@@ -2885,86 +2955,86 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_NonLiteral_332_7_91() {
- if (jj_3R_MapData_361_5_101()) {
+ private boolean jj_3R_NonLiteral_335_7_91() {
+ if (jj_3R_MapData_364_5_101()) {
return true;
}
return false;
}
- private boolean jj_3R_NonLiteral_331_7_90() {
- if (jj_3R_ListData_349_5_100()) {
+ private boolean jj_3R_NonLiteral_334_7_90() {
+ if (jj_3R_ListData_352_5_100()) {
return true;
}
return false;
}
- private boolean jj_3R_LambdaExpressionOrInvocation_141_5_23() {
- if (jj_scan_token(LPAREN)) {
- return true;
- }
- if (jj_3R_LambdaParameters_132_5_27()) {
- return true;
- }
- if (jj_scan_token(ARROW)) {
- return true;
- }
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3_4()) {
- jj_scanpos = xsp;
- if (jj_3R_LambdaExpressionOrInvocation_144_45_30()) {
- return true;
- }
- }
- if (jj_scan_token(RPAREN)) {
+ private boolean jj_3_9() {
+ if (jj_3R_SetData_345_5_25()) {
return true;
}
return false;
}
- private boolean jj_3_8() {
- if (jj_3R_SetData_342_5_25()) {
+ private boolean jj_3R_NonLiteral_332_7_89() {
+ if (jj_3R_Identifier_380_5_38()) {
return true;
}
return false;
}
- private boolean jj_3R_NonLiteral_329_7_89() {
- if (jj_3R_Identifier_377_5_38()) {
+ private boolean jj_3R_NonLiteral_331_7_88() {
+ if (jj_3R_Function_393_5_99()) {
return true;
}
return false;
}
- private boolean jj_3R_NonLiteral_328_7_88() {
- if (jj_3R_Function_390_5_99()) {
+ private boolean jj_3R_NonLiteral_330_7_87() {
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_3R_Expression_99_5_36()) {
+ return true;
+ }
+ if (jj_scan_token(RPAREN)) {
return true;
}
return false;
}
- private boolean jj_3R_NonLiteral_327_7_87() {
+ private boolean jj_3R_LambdaExpressionOrInvocation_141_5_23() {
if (jj_scan_token(LPAREN)) {
return true;
}
- if (jj_3R_Expression_99_5_36()) {
+ if (jj_3R_LambdaParameters_132_5_27()) {
return true;
}
+ if (jj_scan_token(ARROW)) {
+ return true;
+ }
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3_4()) {
+ jj_scanpos = xsp;
+ if (jj_3R_LambdaExpressionOrInvocation_144_45_30()) {
+ return true;
+ }
+ }
if (jj_scan_token(RPAREN)) {
return true;
}
return false;
}
- private boolean jj_3R_MethodParameters_317_16_112() {
+ private boolean jj_3R_MethodParameters_320_16_112() {
if (jj_3R_Expression_99_5_36()) {
return true;
}
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_MethodParameters_317_31_113()) {
+ if (jj_3R_MethodParameters_320_31_113()) {
jj_scanpos = xsp;
break;
}
@@ -2972,29 +3042,29 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_ValueSuffix_291_41_110() {
- if (jj_3R_MethodParameters_317_5_108()) {
+ private boolean jj_3R_ValueSuffix_294_41_110() {
+ if (jj_3R_MethodParameters_320_5_108()) {
return true;
}
return false;
}
- private boolean jj_3R_NonLiteral_326_5_79() {
+ private boolean jj_3R_NonLiteral_329_5_79() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3_6()) {
+ if (jj_3_7()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_327_7_87()) {
+ if (jj_3R_NonLiteral_330_7_87()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_328_7_88()) {
+ if (jj_3R_NonLiteral_331_7_88()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_329_7_89()) {
+ if (jj_3R_NonLiteral_332_7_89()) {
jj_scanpos = xsp;
- if (jj_3_8()) {
+ if (jj_3_9()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_331_7_90()) {
+ if (jj_3R_NonLiteral_334_7_90()) {
jj_scanpos = xsp;
- if (jj_3R_NonLiteral_332_7_91()) {
+ if (jj_3R_NonLiteral_335_7_91()) {
return true;
}
}
@@ -3006,7 +3076,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3_6() {
+ private boolean jj_3_7() {
if (jj_3R_LambdaExpressionOrInvocation_141_5_23()) {
return true;
}
@@ -3014,7 +3084,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
}
private boolean jj_3R_LambdaParameters_132_5_32() {
- if (jj_3R_Identifier_377_5_38()) {
+ if (jj_3R_Identifier_380_5_38()) {
return true;
}
return false;
@@ -3032,26 +3102,26 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3_1() {
- if (jj_scan_token(ASSIGN)) {
+ private boolean jj_3R_MethodParameters_320_5_108() {
+ if (jj_scan_token(LPAREN)) {
return true;
}
- if (jj_3R_Assignment_115_5_20()) {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_MethodParameters_320_16_112()) {
+ jj_scanpos = xsp;
+ }
+ if (jj_scan_token(RPAREN)) {
return true;
}
return false;
}
- private boolean jj_3R_MethodParameters_317_5_108() {
- if (jj_scan_token(LPAREN)) {
+ private boolean jj_3_1() {
+ if (jj_scan_token(ASSIGN)) {
return true;
}
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_MethodParameters_317_16_112()) {
- jj_scanpos = xsp;
- }
- if (jj_scan_token(RPAREN)) {
+ if (jj_3R_Assignment_115_5_20()) {
return true;
}
return false;
@@ -3085,7 +3155,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_BracketSuffix_309_5_93() {
+ private boolean jj_3R_BracketSuffix_312_5_93() {
if (jj_scan_token(LBRACK)) {
return true;
}
@@ -3098,8 +3168,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_ValueSuffix_291_21_81() {
- if (jj_3R_BracketSuffix_309_5_93()) {
+ private boolean jj_3R_ValueSuffix_294_21_81() {
+ if (jj_3R_BracketSuffix_312_5_93()) {
return true;
}
return false;
@@ -3139,7 +3209,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_DotSuffix_300_5_92() {
+ private boolean jj_3R_DotSuffix_303_5_92() {
if (jj_scan_token(DOT)) {
return true;
}
@@ -3164,77 +3234,77 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_ValueSuffix_291_7_80() {
- if (jj_3R_DotSuffix_300_5_92()) {
+ private boolean jj_3R_ValueSuffix_294_7_80() {
+ if (jj_3R_DotSuffix_303_5_92()) {
return true;
}
return false;
}
- private boolean jj_3R_ValueSuffix_291_5_77() {
+ private boolean jj_3R_ValueSuffix_294_5_77() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_ValueSuffix_291_7_80()) {
+ if (jj_3R_ValueSuffix_294_7_80()) {
jj_scanpos = xsp;
- if (jj_3R_ValueSuffix_291_21_81()) {
+ if (jj_3R_ValueSuffix_294_21_81()) {
return true;
}
}
xsp = jj_scanpos;
- if (jj_3R_ValueSuffix_291_41_110()) {
+ if (jj_3R_ValueSuffix_294_41_110()) {
jj_scanpos = xsp;
}
return false;
}
- private boolean jj_3R_Expression_99_5_36() {
- if (jj_3R_Semicolon_107_5_43()) {
+ private boolean jj_3R_Value_275_21_74() {
+ if (jj_3R_ValueSuffix_294_5_77()) {
return true;
}
return false;
}
- private boolean jj_3R_Value_272_21_74() {
- if (jj_3R_ValueSuffix_291_5_77()) {
+ private boolean jj_3R_Expression_99_5_36() {
+ if (jj_3R_Semicolon_107_5_43()) {
return true;
}
return false;
}
- private boolean jj_3R_ValuePrefix_282_7_76() {
- if (jj_3R_NonLiteral_326_5_79()) {
+ private boolean jj_3R_ValuePrefix_285_7_76() {
+ if (jj_3R_NonLiteral_329_5_79()) {
return true;
}
return false;
}
- private boolean jj_3R_ValuePrefix_281_5_73() {
+ private boolean jj_3R_ValuePrefix_284_5_73() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_ValuePrefix_281_5_75()) {
+ if (jj_3R_ValuePrefix_284_5_75()) {
jj_scanpos = xsp;
- if (jj_3R_ValuePrefix_282_7_76()) {
+ if (jj_3R_ValuePrefix_285_7_76()) {
return true;
}
}
return false;
}
- private boolean jj_3R_ValuePrefix_281_5_75() {
- if (jj_3R_Literal_408_5_78()) {
+ private boolean jj_3R_ValuePrefix_284_5_75() {
+ if (jj_3R_Literal_411_5_78()) {
return true;
}
return false;
}
- private boolean jj_3R_Value_272_5_72() {
- if (jj_3R_ValuePrefix_281_5_73()) {
+ private boolean jj_3R_Value_275_5_72() {
+ if (jj_3R_ValuePrefix_284_5_73()) {
return true;
}
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_Value_272_21_74()) {
+ if (jj_3R_Value_275_21_74()) {
jj_scanpos = xsp;
break;
}
@@ -3242,21 +3312,21 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Null_458_5_98() {
+ private boolean jj_3R_Null_461_5_98() {
if (jj_scan_token(NULL)) {
return true;
}
return false;
}
- private boolean jj_3R_Unary_263_9_68() {
- if (jj_3R_Value_272_5_72()) {
+ private boolean jj_3R_Unary_266_9_68() {
+ if (jj_3R_Value_275_5_72()) {
return true;
}
return false;
}
- private boolean jj_3R_Unary_261_9_67() {
+ private boolean jj_3R_Unary_264_9_67() {
if (jj_scan_token(EMPTY)) {
return true;
}
@@ -3266,7 +3336,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Unary_259_9_66() {
+ private boolean jj_3R_Unary_262_9_66() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(37)) {
@@ -3281,17 +3351,45 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
+ private boolean jj_3_6() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(37)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(38)) {
+ return true;
+ }
+ }
+ if (jj_scan_token(EMPTY)) {
+ return true;
+ }
+ if (jj_3R_Unary_257_9_61()) {
+ return true;
+ }
+ return false;
+ }
+
+ private boolean jj_3R_String_452_5_97() {
+ if (jj_scan_token(STRING_LITERAL)) {
+ return true;
+ }
+ return false;
+ }
+
private boolean jj_3R_Unary_257_9_61() {
Token xsp;
xsp = jj_scanpos;
if (jj_3R_Unary_257_9_65()) {
jj_scanpos = xsp;
- if (jj_3R_Unary_259_9_66()) {
+ if (jj_3_6()) {
jj_scanpos = xsp;
- if (jj_3R_Unary_261_9_67()) {
+ if (jj_3R_Unary_262_9_66()) {
jj_scanpos = xsp;
- if (jj_3R_Unary_263_9_68()) {
- return true;
+ if (jj_3R_Unary_264_9_67()) {
+ jj_scanpos = xsp;
+ if (jj_3R_Unary_266_9_68()) {
+ return true;
+ }
}
}
}
@@ -3309,8 +3407,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_String_449_5_97() {
- if (jj_scan_token(STRING_LITERAL)) {
+ private boolean jj_3R_Integer_443_5_96() {
+ if (jj_scan_token(INTEGER_LITERAL)) {
return true;
}
return false;
@@ -3331,13 +3429,6 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Integer_440_5_96() {
- if (jj_scan_token(INTEGER_LITERAL)) {
- return true;
- }
- return false;
- }
-
private boolean jj_3R_Multiplication_245_9_70() {
Token xsp;
xsp = jj_scanpos;
@@ -3378,6 +3469,13 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
+ private boolean jj_3R_FloatingPoint_434_5_95() {
+ if (jj_scan_token(FLOATING_POINT_LITERAL)) {
+ return true;
+ }
+ return false;
+ }
+
private boolean jj_3R_Multiplication_241_5_59() {
if (jj_3R_Unary_257_9_61()) {
return true;
@@ -3393,8 +3491,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_FloatingPoint_431_5_95() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) {
+ private boolean jj_3R_Boolean_426_7_103() {
+ if (jj_scan_token(FALSE)) {
return true;
}
return false;
@@ -3410,13 +3508,25 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Boolean_423_7_103() {
- if (jj_scan_token(FALSE)) {
+ private boolean jj_3R_Boolean_424_5_102() {
+ if (jj_scan_token(TRUE)) {
return true;
}
return false;
}
+ private boolean jj_3R_Boolean_424_5_94() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_Boolean_424_5_102()) {
+ jj_scanpos = xsp;
+ if (jj_3R_Boolean_426_7_103()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private boolean jj_3R_Math_229_9_60() {
Token xsp;
xsp = jj_scanpos;
@@ -3439,25 +3549,6 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Boolean_421_5_102() {
- if (jj_scan_token(TRUE)) {
- return true;
- }
- return false;
- }
-
- private boolean jj_3R_Boolean_421_5_94() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_Boolean_421_5_102()) {
- jj_scanpos = xsp;
- if (jj_3R_Boolean_423_7_103()) {
- return true;
- }
- }
- return false;
- }
-
private boolean jj_3R_Math_227_5_53() {
if (jj_3R_Multiplication_241_5_59()) {
return true;
@@ -3473,45 +3564,45 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Literal_412_7_86() {
- if (jj_3R_Null_458_5_98()) {
+ private boolean jj_3R_Literal_415_7_86() {
+ if (jj_3R_Null_461_5_98()) {
return true;
}
return false;
}
- private boolean jj_3R_Literal_411_7_85() {
- if (jj_3R_String_449_5_97()) {
+ private boolean jj_3R_Literal_414_7_85() {
+ if (jj_3R_String_452_5_97()) {
return true;
}
return false;
}
- private boolean jj_3R_Concatenation_217_10_54() {
- if (jj_scan_token(CONCAT)) {
- return true;
- }
- if (jj_3R_Math_227_5_53()) {
+ private boolean jj_3R_Literal_413_7_84() {
+ if (jj_3R_Integer_443_5_96()) {
return true;
}
return false;
}
- private boolean jj_3R_Literal_410_7_84() {
- if (jj_3R_Integer_440_5_96()) {
+ private boolean jj_3R_Literal_412_7_83() {
+ if (jj_3R_FloatingPoint_434_5_95()) {
return true;
}
return false;
}
- private boolean jj_3R_Literal_409_7_83() {
- if (jj_3R_FloatingPoint_431_5_95()) {
+ private boolean jj_3R_Concatenation_217_10_54() {
+ if (jj_scan_token(CONCAT)) {
+ return true;
+ }
+ if (jj_3R_Math_227_5_53()) {
return true;
}
return false;
}
- private boolean jj_3R_Function_390_24_104() {
+ private boolean jj_3R_Function_393_24_104() {
if (jj_scan_token(COLON)) {
return true;
}
@@ -3521,25 +3612,25 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Literal_408_5_82() {
- if (jj_3R_Boolean_421_5_94()) {
+ private boolean jj_3R_Literal_411_5_82() {
+ if (jj_3R_Boolean_424_5_94()) {
return true;
}
return false;
}
- private boolean jj_3R_Literal_408_5_78() {
+ private boolean jj_3R_Literal_411_5_78() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_Literal_408_5_82()) {
+ if (jj_3R_Literal_411_5_82()) {
jj_scanpos = xsp;
- if (jj_3R_Literal_409_7_83()) {
+ if (jj_3R_Literal_412_7_83()) {
jj_scanpos = xsp;
- if (jj_3R_Literal_410_7_84()) {
+ if (jj_3R_Literal_413_7_84()) {
jj_scanpos = xsp;
- if (jj_3R_Literal_411_7_85()) {
+ if (jj_3R_Literal_414_7_85()) {
jj_scanpos = xsp;
- if (jj_3R_Literal_412_7_86()) {
+ if (jj_3R_Literal_415_7_86()) {
return true;
}
}
@@ -3564,8 +3655,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Function_399_7_105() {
- if (jj_3R_MethodParameters_317_5_108()) {
+ private boolean jj_3R_Function_402_7_105() {
+ if (jj_3R_MethodParameters_320_5_108()) {
return true;
}
return false;
@@ -3616,6 +3707,28 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
+ private boolean jj_3R_Function_393_5_99() {
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_Function_393_24_104()) {
+ jj_scanpos = xsp;
+ }
+ if (jj_3R_Function_402_7_105()) {
+ return true;
+ }
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_Function_402_7_105()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ }
+ return false;
+ }
+
private boolean jj_3R_Compare_198_9_50() {
Token xsp;
xsp = jj_scanpos;
@@ -3649,28 +3762,6 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Function_390_5_99() {
- if (jj_scan_token(IDENTIFIER)) {
- return true;
- }
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_Function_390_24_104()) {
- jj_scanpos = xsp;
- }
- if (jj_3R_Function_399_7_105()) {
- return true;
- }
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_Function_399_7_105()) {
- jj_scanpos = xsp;
- break;
- }
- }
- return false;
- }
-
private boolean jj_3R_Compare_196_5_45() {
if (jj_3R_Concatenation_215_6_49()) {
return true;
@@ -3701,6 +3792,13 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
+ private boolean jj_3R_Identifier_380_5_38() {
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ return false;
+ }
+
private boolean jj_3R_Equality_184_9_46() {
Token xsp;
xsp = jj_scanpos;
@@ -3765,13 +3863,6 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
return false;
}
- private boolean jj_3R_Identifier_377_5_38() {
- if (jj_scan_token(IDENTIFIER)) {
- return true;
- }
- return false;
- }
-
/** Generated Token Manager. */
public ELParserTokenManager token_source;
SimpleCharStream jj_input_stream;
@@ -3783,7 +3874,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
private Token jj_scanpos, jj_lastpos;
private int jj_la;
private int jj_gen;
- final private int[] jj_la1 = new int[54];
+ final private int[] jj_la1 = new int[56];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static {
@@ -3794,19 +3885,20 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
private static void jj_la1_init_0() {
jj_la1_0 = new int[] { 0xe, 0xe, 0x800000, 0x15ed00, 0x15ed00,
0x1000000, 0x0, 0x40000, 0x15ed00, 0x40000, 0x0,
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xfe000000,
0x18000000, 0x6000000, 0x80000000, 0x60000000,
- 0xfe000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x15ed00,
0x120000, 0x15ed00, 0x120000, 0x40000,
- 0x1000000, 0x15ed00, 0x40000, 0x0, 0x100100, 0x1000000,
0x15ed00, 0x1000000, 0x15ed00, 0x1000000,
- 0x15ed00, 0x400000, 0x40000, 0x1ec00, 0xc000, };
+ 0xfe000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
0x15ed00, 0x120000, 0x15ed00, 0x120000,
+ 0x40000, 0x1000000, 0x15ed00, 0x40000, 0x0, 0x100100,
0x1000000, 0x15ed00, 0x1000000, 0x15ed00,
+ 0x1000000, 0x15ed00, 0x400000, 0x40000, 0x1ec00, 0xc000, };
}
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,
0x1008860, 0x0, 0x1000000, 0x0, 0x0, 0x0,
- 0x1008860, 0x0, 0x1000000, 0x0, 0x0, 0x1008860, 0x0,
0x1008860, 0x0, 0x1008860, 0x0, 0x0, 0x0, 0x0, };
+ 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, };
}
- final private JJCalls[] jj_2_rtns = new JJCalls[8];
+ final private JJCalls[] jj_2_rtns = new JJCalls[9];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -3826,7 +3918,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++) {
jj_la1[i] = -1;
}
for (int i = 0; i < jj_2_rtns.length; i++) {
@@ -3851,7 +3943,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++) {
jj_la1[i] = -1;
}
for (int i = 0; i < jj_2_rtns.length; i++) {
@@ -3866,7 +3958,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++) {
jj_la1[i] = -1;
}
for (int i = 0; i < jj_2_rtns.length; i++) {
@@ -3890,7 +3982,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++) {
jj_la1[i] = -1;
}
for (int i = 0; i < jj_2_rtns.length; i++) {
@@ -3904,7 +3996,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++) {
jj_la1[i] = -1;
}
for (int i = 0; i < jj_2_rtns.length; i++) {
@@ -3919,7 +4011,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++) {
jj_la1[i] = -1;
}
for (int i = 0; i < jj_2_rtns.length; i++) {
@@ -4083,7 +4175,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 54; i++) {
+ for (int i = 0; i < 56; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1 << j)) != 0) {
@@ -4129,7 +4221,7 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
private void jj_rescan_token() {
jj_rescan = true;
- for (int i = 0; i < 8; i++) {
+ for (int i = 0; i < 9; i++) {
try {
JJCalls p = jj_2_rtns[i];
@@ -4162,6 +4254,9 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
case 7:
jj_3_8();
break;
+ case 8:
+ jj_3_9();
+ break;
}
}
p = p.next;
diff --git a/java/org/apache/el/parser/ELParserTreeConstants.java
b/java/org/apache/el/parser/ELParserTreeConstants.java
index 240eaf2c90..f126b97391 100644
--- a/java/org/apache/el/parser/ELParserTreeConstants.java
+++ b/java/org/apache/el/parser/ELParserTreeConstants.java
@@ -27,31 +27,32 @@ public interface ELParserTreeConstants {
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;
+ int JJTNOTEMPTY = 25;
+ int JJTNOT = 26;
+ int JJTEMPTY = 27;
+ int JJTVALUE = 28;
+ int JJTDOTSUFFIX = 29;
+ int JJTBRACKETSUFFIX = 30;
+ int JJTMETHODPARAMETERS = 31;
+ int JJTSETDATA = 32;
+ int JJTLISTDATA = 33;
+ int JJTMAPDATA = 34;
+ int JJTMAPENTRY = 35;
+ int JJTIDENTIFIER = 36;
+ int JJTFUNCTION = 37;
+ int JJTTRUE = 38;
+ int JJTFALSE = 39;
+ int JJTFLOATINGPOINT = 40;
+ int JJTINTEGER = 41;
+ int JJTSTRING = 42;
+ int JJTNULL = 43;
String[] jjtNodeName = { "CompositeExpression", "LiteralExpression",
"DeferredExpression", "DynamicExpression",
"void", "Semicolon", "Assign", "LambdaExpression",
"LambdaParameters", "Choice", "Or", "And", "Equal",
"NotEqual", "LessThan", "GreaterThan", "LessThanEqual",
"GreaterThanEqual", "Concatenation", "Plus",
- "Minus", "Mult", "Div", "Mod", "Negative", "Not", "Empty",
"Value", "DotSuffix", "BracketSuffix",
- "MethodParameters", "SetData", "ListData", "MapData", "MapEntry",
"Identifier", "Function", "True", "False",
- "FloatingPoint", "Integer", "String", "Null", };
+ "Minus", "Mult", "Div", "Mod", "Negative", "NotEmpty", "Not",
"Empty", "Value", "DotSuffix",
+ "BracketSuffix", "MethodParameters", "SetData", "ListData",
"MapData", "MapEntry", "Identifier", "Function",
+ "True", "False", "FloatingPoint", "Integer", "String", "Null", };
}
-/* JavaCC - OriginalChecksum=40650ef76eedbdb11f7d9a6683a802ca (do not edit
this line) */
+/* JavaCC - OriginalChecksum=58426e2a94f76068fe7c0861a913f9a5 (do not edit
this line) */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
