Author: markt
Date: Sun Jul 14 08:36:31 2013
New Revision: 1502947
URL: http://svn.apache.org/r1502947
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.java
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=1502947&r1=1502946&r2=1502947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Sun Jul 14 08:36:31
2013
@@ -416,34 +416,7 @@ public class ELParser/*@bgen(jjtree)*/im
jjtree.openNodeScope(jjtn000);
try {
jj_consume_token(LPAREN);
- LambdaParameters();
- jj_consume_token(ARROW);
- if (jj_2_4(3)) {
- LambdaExpression();
- } else {
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- 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 NOT0:
- case NOT1:
- case EMPTY:
- case MINUS:
- case IDENTIFIER:
- Choice();
- break;
- default:
- jj_la1[8] = jj_gen;
- jj_consume_token(-1);
- throw new ParseException();
- }
- }
+ LambdaExpression();
jj_consume_token(RPAREN);
label_5:
while (true) {
@@ -452,7 +425,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[9] = jj_gen;
+ jj_la1[8] = jj_gen;
break label_5;
}
MethodParameters();
@@ -486,7 +459,7 @@ public class ELParser/*@bgen(jjtree)*/im
Or();
label_6:
while (true) {
- if (jj_2_5(3)) {
+ if (jj_2_4(3)) {
;
} else {
break label_6;
@@ -535,7 +508,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[10] = jj_gen;
+ jj_la1[9] = jj_gen;
break label_7;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -546,7 +519,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(OR1);
break;
default:
- jj_la1[11] = jj_gen;
+ jj_la1[10] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -591,7 +564,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[12] = jj_gen;
+ jj_la1[11] = jj_gen;
break label_8;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -602,7 +575,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(AND1);
break;
default:
- jj_la1[13] = jj_gen;
+ jj_la1[12] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -649,7 +622,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[14] = jj_gen;
+ jj_la1[13] = jj_gen;
break label_9;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -663,7 +636,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(EQ1);
break;
default:
- jj_la1[15] = jj_gen;
+ jj_la1[14] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -702,7 +675,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(NE1);
break;
default:
- jj_la1[16] = jj_gen;
+ jj_la1[15] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -732,7 +705,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[17] = jj_gen;
+ jj_la1[16] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -759,7 +732,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[18] = jj_gen;
+ jj_la1[17] = jj_gen;
break label_10;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -773,7 +746,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(LT1);
break;
default:
- jj_la1[19] = jj_gen;
+ jj_la1[18] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -812,7 +785,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(GT1);
break;
default:
- jj_la1[20] = jj_gen;
+ jj_la1[19] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -851,7 +824,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(LE1);
break;
default:
- jj_la1[21] = jj_gen;
+ jj_la1[20] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -890,7 +863,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(GE1);
break;
default:
- jj_la1[22] = jj_gen;
+ jj_la1[21] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -920,7 +893,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[23] = jj_gen;
+ jj_la1[22] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -941,7 +914,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[24] = jj_gen;
+ jj_la1[23] = jj_gen;
break label_11;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1000,7 +973,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[25] = jj_gen;
+ jj_la1[24] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1024,7 +997,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[26] = jj_gen;
+ jj_la1[25] = jj_gen;
break label_12;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1065,7 +1038,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(DIV1);
break;
default:
- jj_la1[27] = jj_gen;
+ jj_la1[26] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1104,7 +1077,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(MOD1);
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[27] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1134,7 +1107,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[29] = jj_gen;
+ jj_la1[28] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1184,7 +1157,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(NOT1);
break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[29] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1253,7 +1226,7 @@ public class ELParser/*@bgen(jjtree)*/im
Value();
break;
default:
- jj_la1[31] = jj_gen;
+ jj_la1[30] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1277,7 +1250,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[31] = jj_gen;
break label_13;
}
ValueSuffix();
@@ -1324,7 +1297,7 @@ public class ELParser/*@bgen(jjtree)*/im
NonLiteral();
break;
default:
- jj_la1[33] = jj_gen;
+ jj_la1[32] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1343,7 +1316,7 @@ public class ELParser/*@bgen(jjtree)*/im
BracketSuffix();
break;
default:
- jj_la1[34] = jj_gen;
+ jj_la1[33] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1352,7 +1325,7 @@ public class ELParser/*@bgen(jjtree)*/im
MethodParameters();
break;
default:
- jj_la1[35] = jj_gen;
+ jj_la1[34] = jj_gen;
;
}
}
@@ -1446,7 +1419,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[36] = jj_gen;
+ jj_la1[35] = jj_gen;
break label_14;
}
jj_consume_token(COMMA);
@@ -1454,7 +1427,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[37] = jj_gen;
+ jj_la1[36] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -1484,7 +1457,7 @@ public class ELParser/*@bgen(jjtree)*/im
* For Grouped Operations, Identifiers, and Functions
*/
final public void NonLiteral() throws ParseException {
- if (jj_2_6(3)) {
+ if (jj_2_5(3)) {
LambdaExpressionOrInvocation();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1494,8 +1467,8 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(RPAREN);
break;
default:
- jj_la1[38] = jj_gen;
- if (jj_2_7(2147483647)) {
+ jj_la1[37] = jj_gen;
+ if (jj_2_6(2147483647)) {
Function();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1503,8 +1476,8 @@ public class ELParser/*@bgen(jjtree)*/im
Identifier();
break;
default:
- jj_la1[39] = jj_gen;
- if (jj_2_8(3)) {
+ jj_la1[38] = jj_gen;
+ if (jj_2_7(3)) {
SetData();
} else {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1515,7 +1488,7 @@ public class ELParser/*@bgen(jjtree)*/im
MapData();
break;
default:
- jj_la1[40] = jj_gen;
+ jj_la1[39] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1556,7 +1529,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[41] = jj_gen;
+ jj_la1[40] = jj_gen;
break label_15;
}
jj_consume_token(COMMA);
@@ -1564,7 +1537,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[42] = jj_gen;
+ jj_la1[41] = jj_gen;
;
}
jj_consume_token(RBRACE);
@@ -1619,7 +1592,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[43] = jj_gen;
+ jj_la1[42] = jj_gen;
break label_16;
}
jj_consume_token(COMMA);
@@ -1627,7 +1600,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[44] = jj_gen;
+ jj_la1[43] = jj_gen;
;
}
jj_consume_token(RBRACK);
@@ -1682,7 +1655,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[45] = jj_gen;
+ jj_la1[44] = jj_gen;
break label_17;
}
jj_consume_token(COMMA);
@@ -1690,7 +1663,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[46] = jj_gen;
+ jj_la1[45] = jj_gen;
;
}
jj_consume_token(RBRACE);
@@ -1777,7 +1750,7 @@ public class ELParser/*@bgen(jjtree)*/im
jjtree.openNodeScope(jjtn000);Token t0 = null;
Token t1 = null;
try {
- if (jj_2_9(2)) {
+ if (jj_2_8(2)) {
t0 = jj_consume_token(IDENTIFIER);
jj_consume_token(COLON);
} else {
@@ -1814,7 +1787,7 @@ public class ELParser/*@bgen(jjtree)*/im
;
break;
default:
- jj_la1[47] = jj_gen;
+ jj_la1[46] = jj_gen;
break label_18;
}
jj_consume_token(COMMA);
@@ -1822,7 +1795,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[48] = jj_gen;
+ jj_la1[47] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -1870,7 +1843,7 @@ public class ELParser/*@bgen(jjtree)*/im
Null();
break;
default:
- jj_la1[49] = jj_gen;
+ jj_la1[48] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1907,7 +1880,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
break;
default:
- jj_la1[50] = jj_gen;
+ jj_la1[49] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -2050,11 +2023,34 @@ public class ELParser/*@bgen(jjtree)*/im
finally { jj_save(7, xla); }
}
- 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_48() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(35)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(36)) return true;
+ }
+ return false;
+ }
+
+ private boolean jj_3R_43() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_47()) {
+ jj_scanpos = xsp;
+ if (jj_3R_48()) return true;
+ }
+ return false;
+ }
+
+ private boolean jj_3R_47() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(33)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(34)) return true;
+ }
+ return false;
}
private boolean jj_3R_39() {
@@ -2077,12 +2073,12 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3_4() {
- if (jj_3R_20()) return true;
+ private boolean jj_3R_41() {
+ if (jj_scan_token(COMMA)) return true;
return false;
}
- private boolean jj_3_9() {
+ private boolean jj_3_8() {
if (jj_scan_token(IDENTIFIER)) return true;
if (jj_scan_token(COLON)) return true;
return false;
@@ -2091,17 +2087,12 @@ public class ELParser/*@bgen(jjtree)*/im
private boolean jj_3R_93() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3_9()) jj_scanpos = xsp;
+ if (jj_3_8()) jj_scanpos = xsp;
if (jj_scan_token(IDENTIFIER)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_41() {
- if (jj_scan_token(COMMA)) return true;
- return false;
- }
-
private boolean jj_3R_32() {
if (jj_3R_38()) return true;
Token xsp;
@@ -2132,28 +2123,28 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
+ private boolean jj_3R_37() {
+ if (jj_3R_36()) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_41()) { jj_scanpos = xsp; break; }
+ }
+ return false;
+ }
+
private boolean jj_3R_36() {
if (jj_scan_token(IDENTIFIER)) return true;
return false;
}
- private boolean jj_3_5() {
+ private boolean jj_3_4() {
if (jj_scan_token(QUESTIONMARK)) return true;
if (jj_3R_21()) return true;
if (jj_scan_token(COLON)) return true;
return false;
}
- private boolean jj_3R_37() {
- if (jj_3R_36()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_41()) { jj_scanpos = xsp; break; }
- }
- return false;
- }
-
private boolean jj_3_3() {
if (jj_3R_20()) return true;
return false;
@@ -2164,7 +2155,7 @@ public class ELParser/*@bgen(jjtree)*/im
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3_5()) { jj_scanpos = xsp; break; }
+ if (jj_3_4()) { jj_scanpos = xsp; break; }
}
return false;
}
@@ -2209,8 +2200,7 @@ public class ELParser/*@bgen(jjtree)*/im
private boolean jj_3R_22() {
if (jj_scan_token(LPAREN)) return true;
- if (jj_3R_26()) return true;
- if (jj_scan_token(ARROW)) return true;
+ if (jj_3R_20()) return true;
return false;
}
@@ -2233,33 +2223,33 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_23() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_scan_token(COLON)) return true;
+ private boolean jj_3R_30() {
+ if (jj_3R_36()) return true;
return false;
}
- private boolean jj_3_7() {
+ private boolean jj_3R_26() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_23()) jj_scanpos = xsp;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_scan_token(LPAREN)) return true;
+ if (jj_3R_30()) {
+ jj_scanpos = xsp;
+ if (jj_3R_31()) return true;
+ }
return false;
}
- private boolean jj_3R_30() {
- if (jj_3R_36()) return true;
+ private boolean jj_3R_23() {
+ if (jj_scan_token(IDENTIFIER)) return true;
+ if (jj_scan_token(COLON)) return true;
return false;
}
- private boolean jj_3R_26() {
+ private boolean jj_3_6() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_30()) {
- jj_scanpos = xsp;
- if (jj_3R_31()) return true;
- }
+ if (jj_3R_23()) jj_scanpos = xsp;
+ if (jj_scan_token(IDENTIFIER)) return true;
+ if (jj_scan_token(LPAREN)) return true;
return false;
}
@@ -2272,6 +2262,12 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
+ private boolean jj_3_1() {
+ if (jj_scan_token(ASSIGN)) return true;
+ if (jj_3R_19()) return true;
+ return false;
+ }
+
private boolean jj_3R_85() {
if (jj_3R_95()) return true;
return false;
@@ -2282,13 +2278,19 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3_1() {
- if (jj_scan_token(ASSIGN)) return true;
- if (jj_3R_19()) return true;
+ private boolean jj_3R_20() {
+ if (jj_3R_26()) return true;
+ if (jj_scan_token(ARROW)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3_3()) {
+ jj_scanpos = xsp;
+ if (jj_3R_27()) return true;
+ }
return false;
}
- private boolean jj_3_8() {
+ private boolean jj_3_7() {
if (jj_3R_24()) return true;
return false;
}
@@ -2298,20 +2300,13 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_82() {
- if (jj_3R_93()) return true;
+ private boolean jj_3R_44() {
+ if (jj_scan_token(SEMICOLON)) return true;
return false;
}
- private boolean jj_3R_20() {
- if (jj_3R_26()) return true;
- if (jj_scan_token(ARROW)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3_3()) {
- jj_scanpos = xsp;
- if (jj_3R_27()) return true;
- }
+ private boolean jj_3R_82() {
+ if (jj_3R_93()) return true;
return false;
}
@@ -2321,12 +2316,7 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_44() {
- if (jj_scan_token(SEMICOLON)) return true;
- return false;
- }
-
- private boolean jj_3_6() {
+ private boolean jj_3_5() {
if (jj_3R_22()) return true;
return false;
}
@@ -2334,7 +2324,7 @@ public class ELParser/*@bgen(jjtree)*/im
private boolean jj_3R_73() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3_6()) {
+ if (jj_3_5()) {
jj_scanpos = xsp;
if (jj_3R_81()) {
jj_scanpos = xsp;
@@ -2342,7 +2332,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_scanpos = xsp;
if (jj_3R_83()) {
jj_scanpos = xsp;
- if (jj_3_8()) {
+ if (jj_3_7()) {
jj_scanpos = xsp;
if (jj_3R_84()) {
jj_scanpos = xsp;
@@ -2396,13 +2386,13 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_75() {
- if (jj_3R_87()) return true;
+ private boolean jj_3R_34() {
+ if (jj_3R_40()) return true;
return false;
}
- private boolean jj_3R_34() {
- if (jj_3R_40()) return true;
+ private boolean jj_3R_75() {
+ if (jj_3R_87()) return true;
return false;
}
@@ -2733,41 +2723,11 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_48() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(35)) {
- jj_scanpos = xsp;
- if (jj_scan_token(36)) return true;
- }
- return false;
- }
-
private boolean jj_3R_27() {
if (jj_3R_21()) return true;
return false;
}
- private boolean jj_3R_43() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_47()) {
- jj_scanpos = xsp;
- if (jj_3R_48()) return true;
- }
- return false;
- }
-
- private boolean jj_3R_47() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_scan_token(33)) {
- jj_scanpos = xsp;
- if (jj_scan_token(34)) return true;
- }
- return false;
- }
-
/** Generated Token Manager. */
public ELParserTokenManager token_source;
SimpleCharStream jj_input_stream;
@@ -2779,7 +2739,7 @@ public class ELParser/*@bgen(jjtree)*/im
private Token jj_scanpos, jj_lastpos;
private int jj_la;
private int jj_gen;
- final private int[] jj_la1 = new int[51];
+ final private int[] jj_la1 = new int[50];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static {
@@ -2787,12 +2747,12 @@ public class ELParser/*@bgen(jjtree)*/im
jj_la1_init_1();
}
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,0xfe000000,0x18000000,0x6000000,0x80000000,0x60000000,0xfe000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x15ed00,0x120000,0x15ed00,0x120000,0x40000,0x1000000,0x15ed00,0x40000,0x0,0x100100,0x1000000,0x15ed00,0x1000000,0x15ed00,0x1000000,0x15ed00,0x1000000,0x15ed00,0x1ec00,0xc000,};
+ jj_la1_0 = new int[]
{0xe,0xe,0x800000,0x15ed00,0x15ed00,0x1000000,0x0,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000000,0x18000000,0x6000000,0x80000000,0x60000000,0xfe000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x15ed00,0x120000,0x15ed00,0x120000,0x40000,0x1000000,0x15ed00,0x40000,0x0,0x100100,0x1000000,0x15ed00,0x1000000,0x15ed00,0x1000000,0x15ed00,0x1000000,0x15ed00,0x1ec00,0xc000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[]
{0x0,0x0,0x0,0x808860,0x808860,0x0,0x800000,0x800000,0x808860,0x0,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x60000,0x180000,0x1e2000,0x60,0x808860,0x0,0x800000,0x0,0x0,0x0,0x808860,0x0,0x800000,0x0,0x0,0x808860,0x0,0x808860,0x0,0x808860,0x0,0x808860,0x0,0x0,};
+ jj_la1_1 = new int[]
{0x0,0x0,0x0,0x808860,0x808860,0x0,0x800000,0x800000,0x0,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x60000,0x180000,0x1e2000,0x60,0x808860,0x0,0x800000,0x0,0x0,0x0,0x808860,0x0,0x800000,0x0,0x0,0x808860,0x0,0x808860,0x0,0x808860,0x0,0x808860,0x0,0x0,};
}
- final private JJCalls[] jj_2_rtns = new JJCalls[9];
+ final private JJCalls[] jj_2_rtns = new JJCalls[8];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -2807,7 +2767,7 @@ public class ELParser/*@bgen(jjtree)*/im
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 51; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 50; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2823,7 +2783,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 51; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 50; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2834,7 +2794,7 @@ public class ELParser/*@bgen(jjtree)*/im
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 51; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 50; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2846,7 +2806,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 51; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 50; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2856,7 +2816,7 @@ public class ELParser/*@bgen(jjtree)*/im
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 51; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 50; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2867,7 +2827,7 @@ public class ELParser/*@bgen(jjtree)*/im
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 51; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 50; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2984,7 +2944,7 @@ public class ELParser/*@bgen(jjtree)*/im
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 51; i++) {
+ for (int i = 0; i < 50; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -3023,7 +2983,7 @@ public class ELParser/*@bgen(jjtree)*/im
private void jj_rescan_token() {
jj_rescan = true;
- for (int i = 0; i < 9; i++) {
+ for (int i = 0; i < 8; i++) {
try {
JJCalls p = jj_2_rtns[i];
do {
@@ -3038,7 +2998,6 @@ public class ELParser/*@bgen(jjtree)*/im
case 5: jj_3_6(); break;
case 6: jj_3_7(); break;
case 7: jj_3_8(); break;
- case 8: jj_3_9(); break;
}
}
p = p.next;
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?rev=1502947&r1=1502946&r2=1502947&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Sun Jul 14 08:36:31 2013
@@ -138,10 +138,7 @@ void LambdaParameters() #LambdaParameter
*/
void LambdaExpressionOrInvocation() #LambdaExpressionOrInvocation : {}
{
- <LPAREN>
- LambdaParameters() <ARROW> ( LOOKAHEAD(3) LambdaExpression() |
Choice() )
- <RPAREN>
- ( MethodParameters() )*
+ <LPAREN> LambdaExpression() <RPAREN> ( MethodParameters() )*
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
