Author: markt
Date: Tue Jul 16 15:46:34 2013
New Revision: 1503766
URL: http://svn.apache.org/r1503766
Log:
Rever r1503672
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=1503766&r1=1503765&r2=1503766&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Tue Jul 16 15:46:34
2013
@@ -418,13 +418,17 @@ public class ELParser/*@bgen(jjtree)*/im
jj_consume_token(LPAREN);
LambdaExpression();
jj_consume_token(RPAREN);
- switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
- case LPAREN:
+ label_5:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ ;
+ break;
+ default:
+ jj_la1[8] = jj_gen;
+ break label_5;
+ }
MethodParameters();
- break;
- default:
- jj_la1[8] = jj_gen;
- ;
}
} catch (Throwable jjte000) {
if (jjtc000) {
@@ -453,12 +457,12 @@ public class ELParser/*@bgen(jjtree)*/im
*/
final public void Choice() throws ParseException {
Or();
- label_5:
+ label_6:
while (true) {
if (jj_2_4(3)) {
;
} else {
- break label_5;
+ break label_6;
}
jj_consume_token(QUESTIONMARK);
Choice();
@@ -496,7 +500,7 @@ public class ELParser/*@bgen(jjtree)*/im
*/
final public void Or() throws ParseException {
And();
- label_6:
+ label_7:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case OR0:
@@ -505,7 +509,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[9] = jj_gen;
- break label_6;
+ break label_7;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case OR0:
@@ -552,7 +556,7 @@ public class ELParser/*@bgen(jjtree)*/im
*/
final public void And() throws ParseException {
Equality();
- label_7:
+ label_8:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AND0:
@@ -561,7 +565,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[11] = jj_gen;
- break label_7;
+ break label_8;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case AND0:
@@ -608,7 +612,7 @@ public class ELParser/*@bgen(jjtree)*/im
*/
final public void Equality() throws ParseException {
Compare();
- label_8:
+ label_9:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EQ0:
@@ -619,7 +623,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[13] = jj_gen;
- break label_8;
+ break label_9;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EQ0:
@@ -714,7 +718,7 @@ public class ELParser/*@bgen(jjtree)*/im
*/
final public void Compare() throws ParseException {
Concatenation();
- label_9:
+ label_10:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case GT0:
@@ -729,7 +733,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[17] = jj_gen;
- break label_9;
+ break label_10;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LT0:
@@ -903,7 +907,7 @@ public class ELParser/*@bgen(jjtree)*/im
*/
final public void Concatenation() throws ParseException {
Math();
- label_10:
+ label_11:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CONCAT:
@@ -911,7 +915,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[23] = jj_gen;
- break label_10;
+ break label_11;
}
jj_consume_token(CONCAT);
AstConcatenation jjtn001 = new
AstConcatenation(JJTCONCATENATION);
@@ -947,7 +951,7 @@ public class ELParser/*@bgen(jjtree)*/im
*/
final public void Math() throws ParseException {
Multiplication();
- label_11:
+ label_12:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
@@ -956,7 +960,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[24] = jj_gen;
- break label_11;
+ break label_12;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
@@ -1027,7 +1031,7 @@ public class ELParser/*@bgen(jjtree)*/im
*/
final public void Multiplication() throws ParseException {
Unary();
- label_12:
+ label_13:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case MULT:
@@ -1039,7 +1043,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[26] = jj_gen;
- break label_12;
+ break label_13;
}
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case MULT:
@@ -1283,7 +1287,7 @@ public class ELParser/*@bgen(jjtree)*/im
jjtree.openNodeScope(jjtn001);
try {
ValuePrefix();
- label_13:
+ label_14:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case DOT:
@@ -1292,7 +1296,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[32] = jj_gen;
- break label_13;
+ break label_14;
}
ValueSuffix();
}
@@ -1453,7 +1457,7 @@ public class ELParser/*@bgen(jjtree)*/im
case MINUS:
case IDENTIFIER:
Expression();
- label_14:
+ label_15:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
@@ -1461,7 +1465,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[36] = jj_gen;
- break label_14;
+ break label_15;
}
jj_consume_token(COMMA);
Expression();
@@ -1540,11 +1544,6 @@ public class ELParser/*@bgen(jjtree)*/im
}
}
-/*
- * Note that both an empty Set and an empty Map are represented by {}. The
- * parser will always parse {} as an empty Set and special handling is required
- * to convert it to an empty Map when appropriate.
- */
final public void SetData() throws ParseException {
/*@bgen(jjtree) SetData */
AstSetData jjtn000 = new AstSetData(JJTSETDATA);
@@ -1568,7 +1567,7 @@ public class ELParser/*@bgen(jjtree)*/im
case MINUS:
case IDENTIFIER:
Expression();
- label_15:
+ label_16:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
@@ -1576,7 +1575,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[41] = jj_gen;
- break label_15;
+ break label_16;
}
jj_consume_token(COMMA);
Expression();
@@ -1631,7 +1630,7 @@ public class ELParser/*@bgen(jjtree)*/im
case MINUS:
case IDENTIFIER:
Expression();
- label_16:
+ label_17:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
@@ -1639,7 +1638,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[43] = jj_gen;
- break label_16;
+ break label_17;
}
jj_consume_token(COMMA);
Expression();
@@ -1671,11 +1670,6 @@ public class ELParser/*@bgen(jjtree)*/im
}
}
-/*
- * Note that both an empty Set and an empty Map are represented by {}. The
- * parser will always parse {} as an empty Set and special handling is required
- * to convert it to an empty Map when appropriate.
- */
final public void MapData() throws ParseException {
/*@bgen(jjtree) MapData */
AstMapData jjtn000 = new AstMapData(JJTMAPDATA);
@@ -1699,7 +1693,7 @@ public class ELParser/*@bgen(jjtree)*/im
case MINUS:
case IDENTIFIER:
MapEntry();
- label_17:
+ label_18:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
@@ -1707,7 +1701,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[45] = jj_gen;
- break label_17;
+ break label_18;
}
jj_consume_token(COMMA);
MapEntry();
@@ -1831,7 +1825,7 @@ public class ELParser/*@bgen(jjtree)*/im
case MINUS:
case IDENTIFIER:
Expression();
- label_18:
+ label_19:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
@@ -1839,7 +1833,7 @@ public class ELParser/*@bgen(jjtree)*/im
break;
default:
jj_la1[47] = jj_gen;
- break label_18;
+ break label_19;
}
jj_consume_token(COMMA);
Expression();
@@ -2074,7 +2068,7 @@ public class ELParser/*@bgen(jjtree)*/im
finally { jj_save(7, xla); }
}
- private boolean jj_3R_48() {
+ private boolean jj_3R_49() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(35)) {
@@ -2084,17 +2078,32 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_43() {
+ private boolean jj_3_8() {
+ if (jj_scan_token(IDENTIFIER)) return true;
+ if (jj_scan_token(COLON)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_96() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_47()) {
+ 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_44() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_48()) {
jj_scanpos = xsp;
- if (jj_3R_48()) return true;
+ if (jj_3R_49()) return true;
}
return false;
}
- private boolean jj_3R_47() {
+ private boolean jj_3R_48() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(33)) {
@@ -2104,12 +2113,7 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_36() {
- if (jj_scan_token(IDENTIFIER)) return true;
- return false;
- }
-
- private boolean jj_3R_39() {
+ private boolean jj_3R_40() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(39)) {
@@ -2119,47 +2123,37 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_38() {
- if (jj_3R_42()) return true;
+ private boolean jj_3R_39() {
+ if (jj_3R_43()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_43()) { jj_scanpos = xsp; break; }
+ if (jj_3R_44()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_41() {
+ private boolean jj_3R_42() {
if (jj_scan_token(COMMA)) return true;
return false;
}
- private boolean jj_3R_102() {
- if (jj_3R_34()) return true;
- return false;
- }
-
- private boolean jj_3R_101() {
- if (jj_3R_102()) return true;
+ private boolean jj_3R_37() {
+ if (jj_scan_token(IDENTIFIER)) return true;
return false;
}
- private boolean jj_3R_32() {
- if (jj_3R_38()) return true;
+ private boolean jj_3R_33() {
+ if (jj_3R_39()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_39()) { jj_scanpos = xsp; break; }
+ if (jj_3R_40()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_35() {
- if (jj_scan_token(COMMA)) return true;
- return false;
- }
-
- private boolean jj_3R_33() {
+ private boolean jj_3R_34() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(41)) {
@@ -2169,100 +2163,106 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_97() {
- if (jj_scan_token(START_SET_OR_MAP)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_101()) jj_scanpos = xsp;
- if (jj_scan_token(RBRACE)) return true;
+ private boolean jj_3R_36() {
+ if (jj_scan_token(COMMA)) return true;
return false;
}
- private boolean jj_3R_100() {
- if (jj_3R_34()) return true;
+ private boolean jj_3R_103() {
+ if (jj_3R_35()) return true;
return false;
}
- private boolean jj_3R_28() {
- if (jj_3R_32()) return true;
+ private boolean jj_3R_102() {
+ if (jj_3R_103()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_29() {
+ if (jj_3R_33()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_33()) { jj_scanpos = xsp; break; }
+ if (jj_3R_34()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_37() {
- if (jj_3R_36()) return true;
+ private boolean jj_3R_38() {
+ if (jj_3R_37()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_41()) { jj_scanpos = xsp; break; }
+ if (jj_3R_42()) { jj_scanpos = xsp; break; }
}
return false;
}
private boolean jj_3_4() {
if (jj_scan_token(QUESTIONMARK)) return true;
- if (jj_3R_21()) return true;
+ if (jj_3R_22()) return true;
if (jj_scan_token(COLON)) return true;
return false;
}
- private boolean jj_3R_96() {
- if (jj_scan_token(LBRACK)) return true;
+ private boolean jj_3R_101() {
+ if (jj_3R_35()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_98() {
+ if (jj_scan_token(START_SET_OR_MAP)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_100()) jj_scanpos = xsp;
- if (jj_scan_token(RBRACK)) return true;
+ if (jj_3R_102()) jj_scanpos = xsp;
+ if (jj_scan_token(RBRACE)) return true;
return false;
}
private boolean jj_3_3() {
- if (jj_3R_20()) return true;
+ if (jj_3R_21()) return true;
return false;
}
- private boolean jj_3R_29() {
- if (jj_3R_34()) return true;
+ private boolean jj_3R_22() {
+ if (jj_3R_29()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_35()) { jj_scanpos = xsp; break; }
+ if (jj_3_4()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_21() {
- if (jj_3R_28()) return true;
+ private boolean jj_3R_97() {
+ if (jj_scan_token(LBRACK)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_101()) jj_scanpos = xsp;
+ if (jj_scan_token(RBRACK)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_30() {
+ if (jj_3R_35()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3_4()) { jj_scanpos = xsp; break; }
+ if (jj_3R_36()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_31() {
+ private boolean jj_3R_32() {
if (jj_scan_token(LPAREN)) return true;
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_37()) jj_scanpos = xsp;
+ if (jj_3R_38()) jj_scanpos = xsp;
if (jj_scan_token(RPAREN)) return true;
return false;
}
private boolean jj_3R_24() {
- if (jj_scan_token(START_SET_OR_MAP)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_29()) jj_scanpos = xsp;
- if (jj_scan_token(RBRACE)) return true;
- return false;
- }
-
- private boolean jj_3R_23() {
if (jj_scan_token(IDENTIFIER)) return true;
if (jj_scan_token(COLON)) return true;
return false;
@@ -2271,85 +2271,94 @@ public class ELParser/*@bgen(jjtree)*/im
private boolean jj_3_6() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_23()) jj_scanpos = xsp;
+ if (jj_3R_24()) jj_scanpos = xsp;
if (jj_scan_token(IDENTIFIER)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_22() {
+ private boolean jj_3R_23() {
if (jj_scan_token(LPAREN)) return true;
- if (jj_3R_20()) return true;
+ if (jj_3R_21()) return true;
return false;
}
- private boolean jj_3R_87() {
- if (jj_3R_97()) return true;
+ private boolean jj_3R_25() {
+ if (jj_scan_token(START_SET_OR_MAP)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_30()) jj_scanpos = xsp;
+ if (jj_scan_token(RBRACE)) return true;
return false;
}
- private boolean jj_3R_86() {
- if (jj_3R_96()) return true;
+ private boolean jj_3R_88() {
+ if (jj_3R_98()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_87() {
+ if (jj_3R_97()) return true;
return false;
}
private boolean jj_3_7() {
- if (jj_3R_24()) return true;
+ if (jj_3R_25()) return true;
return false;
}
- private boolean jj_3R_85() {
- if (jj_3R_36()) return true;
+ private boolean jj_3R_86() {
+ if (jj_3R_37()) return true;
return false;
}
- private boolean jj_3R_84() {
- if (jj_3R_95()) return true;
+ private boolean jj_3R_85() {
+ if (jj_3R_96()) return true;
return false;
}
- private boolean jj_3R_83() {
+ private boolean jj_3R_84() {
if (jj_scan_token(LPAREN)) return true;
- if (jj_3R_34()) return true;
+ if (jj_3R_35()) return true;
return false;
}
- private boolean jj_3R_30() {
- if (jj_3R_36()) return true;
+ private boolean jj_3R_31() {
+ if (jj_3R_37()) return true;
return false;
}
- private boolean jj_3R_26() {
+ private boolean jj_3R_27() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_30()) {
+ if (jj_3R_31()) {
jj_scanpos = xsp;
- if (jj_3R_31()) return true;
+ if (jj_3R_32()) return true;
}
return false;
}
private boolean jj_3_5() {
- if (jj_3R_22()) return true;
+ if (jj_3R_23()) return true;
return false;
}
- private boolean jj_3R_75() {
+ private boolean jj_3R_76() {
Token xsp;
xsp = jj_scanpos;
if (jj_3_5()) {
jj_scanpos = xsp;
- if (jj_3R_83()) {
- jj_scanpos = xsp;
if (jj_3R_84()) {
jj_scanpos = xsp;
if (jj_3R_85()) {
jj_scanpos = xsp;
+ if (jj_3R_86()) {
+ jj_scanpos = xsp;
if (jj_3_7()) {
jj_scanpos = xsp;
- if (jj_3R_86()) {
+ if (jj_3R_87()) {
jj_scanpos = xsp;
- if (jj_3R_87()) return true;
+ if (jj_3R_88()) return true;
}
}
}
@@ -2361,29 +2370,29 @@ public class ELParser/*@bgen(jjtree)*/im
private boolean jj_3_1() {
if (jj_scan_token(ASSIGN)) return true;
- if (jj_3R_19()) return true;
+ if (jj_3R_20()) return true;
return false;
}
- private boolean jj_3R_20() {
- if (jj_3R_26()) return true;
+ private boolean jj_3R_21() {
+ if (jj_3R_27()) 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;
+ if (jj_3R_28()) return true;
}
return false;
}
- private boolean jj_3R_44() {
+ private boolean jj_3R_45() {
if (jj_scan_token(SEMICOLON)) return true;
return false;
}
- private boolean jj_3R_25() {
- if (jj_3R_21()) return true;
+ private boolean jj_3R_26() {
+ if (jj_3R_22()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -2393,155 +2402,150 @@ public class ELParser/*@bgen(jjtree)*/im
}
private boolean jj_3_2() {
- if (jj_3R_20()) return true;
+ if (jj_3R_21()) return true;
return false;
}
- private boolean jj_3R_19() {
+ private boolean jj_3R_20() {
Token xsp;
xsp = jj_scanpos;
if (jj_3_2()) {
jj_scanpos = xsp;
- if (jj_3R_25()) return true;
+ if (jj_3R_26()) return true;
}
return false;
}
- private boolean jj_3R_89() {
+ private boolean jj_3R_90() {
if (jj_scan_token(LBRACK)) return true;
return false;
}
- private boolean jj_3R_77() {
- if (jj_3R_89()) return true;
+ private boolean jj_3R_78() {
+ if (jj_3R_90()) return true;
return false;
}
- private boolean jj_3R_40() {
- if (jj_3R_19()) return true;
+ private boolean jj_3R_41() {
+ if (jj_3R_20()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_44()) { jj_scanpos = xsp; break; }
+ if (jj_3R_45()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_88() {
+ private boolean jj_3R_89() {
if (jj_scan_token(DOT)) return true;
return false;
}
- private boolean jj_3R_34() {
- if (jj_3R_40()) return true;
+ private boolean jj_3R_35() {
+ if (jj_3R_41()) return true;
return false;
}
- private boolean jj_3R_76() {
- if (jj_3R_88()) return true;
+ private boolean jj_3R_77() {
+ if (jj_3R_89()) return true;
return false;
}
- private boolean jj_3R_73() {
+ private boolean jj_3R_74() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_76()) {
+ if (jj_3R_77()) {
jj_scanpos = xsp;
- if (jj_3R_77()) return true;
+ if (jj_3R_78()) return true;
}
return false;
}
- private boolean jj_3R_70() {
- if (jj_3R_73()) return true;
+ private boolean jj_3R_71() {
+ if (jj_3R_74()) return true;
return false;
}
- private boolean jj_3R_72() {
- if (jj_3R_75()) return true;
+ private boolean jj_3R_73() {
+ if (jj_3R_76()) return true;
return false;
}
- private boolean jj_3R_69() {
+ private boolean jj_3R_70() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_71()) {
+ if (jj_3R_72()) {
jj_scanpos = xsp;
- if (jj_3R_72()) return true;
+ if (jj_3R_73()) return true;
}
return false;
}
- private boolean jj_3R_71() {
- if (jj_3R_74()) return true;
+ private boolean jj_3R_72() {
+ if (jj_3R_75()) return true;
return false;
}
- private boolean jj_3R_68() {
- if (jj_3R_69()) return true;
+ private boolean jj_3R_69() {
+ if (jj_3R_70()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_70()) { jj_scanpos = xsp; break; }
+ if (jj_3R_71()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_94() {
- if (jj_scan_token(NULL)) return true;
+ private boolean jj_3R_65() {
+ if (jj_3R_69()) return true;
return false;
}
private boolean jj_3R_64() {
- if (jj_3R_68()) return true;
- return false;
- }
-
- private boolean jj_3R_63() {
if (jj_scan_token(EMPTY)) return true;
- if (jj_3R_57()) return true;
+ if (jj_3R_58()) return true;
return false;
}
- private boolean jj_3R_62() {
+ private boolean jj_3R_63() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(37)) {
jj_scanpos = xsp;
if (jj_scan_token(38)) return true;
}
- if (jj_3R_57()) return true;
+ if (jj_3R_58()) return true;
return false;
}
- private boolean jj_3R_57() {
+ private boolean jj_3R_58() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_61()) {
- jj_scanpos = xsp;
if (jj_3R_62()) {
jj_scanpos = xsp;
if (jj_3R_63()) {
jj_scanpos = xsp;
- if (jj_3R_64()) return true;
+ if (jj_3R_64()) {
+ jj_scanpos = xsp;
+ if (jj_3R_65()) return true;
}
}
}
return false;
}
- private boolean jj_3R_61() {
+ private boolean jj_3R_62() {
if (jj_scan_token(MINUS)) return true;
- if (jj_3R_57()) return true;
+ if (jj_3R_58()) return true;
return false;
}
- private boolean jj_3R_93() {
- if (jj_scan_token(STRING_LITERAL)) return true;
+ private boolean jj_3R_95() {
+ if (jj_scan_token(NULL)) return true;
return false;
}
- private boolean jj_3R_67() {
+ private boolean jj_3R_68() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(51)) {
@@ -2551,12 +2555,7 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_92() {
- if (jj_scan_token(INTEGER_LITERAL)) return true;
- return false;
- }
-
- private boolean jj_3R_66() {
+ private boolean jj_3R_67() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(49)) {
@@ -2566,96 +2565,121 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_58() {
+ private boolean jj_3R_94() {
+ if (jj_scan_token(STRING_LITERAL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_59() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_65()) {
- jj_scanpos = xsp;
if (jj_3R_66()) {
jj_scanpos = xsp;
- if (jj_3R_67()) return true;
+ if (jj_3R_67()) {
+ jj_scanpos = xsp;
+ if (jj_3R_68()) return true;
}
}
return false;
}
- private boolean jj_3R_65() {
+ private boolean jj_3R_66() {
if (jj_scan_token(MULT)) return true;
return false;
}
- private boolean jj_3R_55() {
- if (jj_3R_57()) return true;
+ private boolean jj_3R_56() {
+ if (jj_3R_58()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_58()) { jj_scanpos = xsp; break; }
+ if (jj_3R_59()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_91() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+ private boolean jj_3R_93() {
+ if (jj_scan_token(INTEGER_LITERAL)) return true;
return false;
}
- private boolean jj_3R_60() {
+ private boolean jj_3R_61() {
if (jj_scan_token(MINUS)) return true;
return false;
}
- private boolean jj_3R_99() {
- if (jj_scan_token(FALSE)) return true;
- return false;
- }
-
- private boolean jj_3R_56() {
+ private boolean jj_3R_57() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_59()) {
+ if (jj_3R_60()) {
jj_scanpos = xsp;
- if (jj_3R_60()) return true;
+ if (jj_3R_61()) return true;
}
return false;
}
- private boolean jj_3R_59() {
+ private boolean jj_3R_60() {
if (jj_scan_token(PLUS)) return true;
return false;
}
- private boolean jj_3R_98() {
+ private boolean jj_3R_92() {
+ if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_50() {
+ if (jj_3R_56()) return true;
+ Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_57()) { jj_scanpos = xsp; break; }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_100() {
+ if (jj_scan_token(FALSE)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_51() {
+ if (jj_scan_token(CONCAT)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_99() {
if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_90() {
+ private boolean jj_3R_91() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_98()) {
+ if (jj_3R_99()) {
jj_scanpos = xsp;
- if (jj_3R_99()) return true;
+ if (jj_3R_100()) return true;
}
return false;
}
- private boolean jj_3R_49() {
- if (jj_3R_55()) return true;
+ private boolean jj_3R_46() {
+ if (jj_3R_50()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_56()) { jj_scanpos = xsp; break; }
+ if (jj_3R_51()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_82() {
- if (jj_3R_94()) return true;
+ private boolean jj_3R_83() {
+ if (jj_3R_95()) return true;
return false;
}
- private boolean jj_3R_50() {
- if (jj_scan_token(CONCAT)) return true;
+ private boolean jj_3R_82() {
+ if (jj_3R_94()) return true;
return false;
}
@@ -2669,23 +2693,28 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_79() {
- if (jj_3R_91()) return true;
+ private boolean jj_3R_55() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_scan_token(29)) {
+ jj_scanpos = xsp;
+ if (jj_scan_token(30)) return true;
+ }
return false;
}
- private boolean jj_3R_74() {
+ private boolean jj_3R_75() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_78()) {
- jj_scanpos = xsp;
if (jj_3R_79()) {
jj_scanpos = xsp;
if (jj_3R_80()) {
jj_scanpos = xsp;
if (jj_3R_81()) {
jj_scanpos = xsp;
- if (jj_3R_82()) return true;
+ if (jj_3R_82()) {
+ jj_scanpos = xsp;
+ if (jj_3R_83()) return true;
}
}
}
@@ -2693,34 +2722,14 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_78() {
- if (jj_3R_90()) return true;
- return false;
- }
-
- private boolean jj_3R_45() {
- if (jj_3R_49()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_50()) { jj_scanpos = xsp; break; }
- }
+ private boolean jj_3R_79() {
+ if (jj_3R_91()) return true;
return false;
}
private boolean jj_3R_54() {
Token xsp;
xsp = jj_scanpos;
- if (jj_scan_token(29)) {
- jj_scanpos = xsp;
- if (jj_scan_token(30)) return true;
- }
- return false;
- }
-
- private boolean jj_3R_53() {
- Token xsp;
- xsp = jj_scanpos;
if (jj_scan_token(31)) {
jj_scanpos = xsp;
if (jj_scan_token(32)) return true;
@@ -2728,7 +2737,7 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_52() {
+ private boolean jj_3R_53() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(25)) {
@@ -2738,23 +2747,23 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3R_46() {
+ private boolean jj_3R_47() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_51()) {
- jj_scanpos = xsp;
if (jj_3R_52()) {
jj_scanpos = xsp;
if (jj_3R_53()) {
jj_scanpos = xsp;
- if (jj_3R_54()) return true;
+ if (jj_3R_54()) {
+ jj_scanpos = xsp;
+ if (jj_3R_55()) return true;
}
}
}
return false;
}
- private boolean jj_3R_51() {
+ private boolean jj_3R_52() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(27)) {
@@ -2764,33 +2773,18 @@ public class ELParser/*@bgen(jjtree)*/im
return false;
}
- private boolean jj_3_8() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_scan_token(COLON)) return true;
- return false;
- }
-
- private boolean jj_3R_95() {
- Token xsp;
- xsp = jj_scanpos;
- 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_42() {
- if (jj_3R_45()) return true;
+ private boolean jj_3R_43() {
+ if (jj_3R_46()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_46()) { jj_scanpos = xsp; break; }
+ if (jj_3R_47()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_27() {
- if (jj_3R_21()) return true;
+ private boolean jj_3R_28() {
+ if (jj_3R_22()) return true;
return false;
}
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=1503766&r1=1503765&r2=1503766&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Tue Jul 16 15:46:34 2013
@@ -138,7 +138,7 @@ void LambdaParameters() #LambdaParameter
*/
void LambdaExpressionOrInvocation() #LambdaExpressionOrInvocation : {}
{
- <LPAREN> LambdaExpression() <RPAREN> ( MethodParameters() )?
+ <LPAREN> LambdaExpression() <RPAREN> ( MethodParameters() )*
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
