Author: remy.maucherat(a)jboss.com
Date: 2009-11-20 22:06:09 -0500 (Fri, 20 Nov 2009)
New Revision: 1283
Modified:
trunk/java/org/apache/el/parser/ELParser.java
trunk/java/org/apache/el/parser/ELParser.jjt
Log:
- Add the new generated parser.
Modified: trunk/java/org/apache/el/parser/ELParser.java
===================================================================
--- trunk/java/org/apache/el/parser/ELParser.java 2009-11-21 02:42:29 UTC (rev 1282)
+++ trunk/java/org/apache/el/parser/ELParser.java 2009-11-21 03:06:09 UTC (rev 1283)
@@ -1053,9 +1053,31 @@
try {
jj_consume_token(DOT);
t = jj_consume_token(IDENTIFIER);
- jjtree.closeNodeScope(jjtn000, true);
- jjtc000 = false;
jjtn000.setImage(t.image);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ jj_consume_token(LPAREN);
+ Parameters();
+ jj_consume_token(RPAREN);
+ break;
+ default:
+ jj_la1[27] = jj_gen;
+ ;
+ }
+ } catch (Throwable jjte000) {
+ if (jjtc000) {
+ jjtree.clearNodeScope(jjtn000);
+ jjtc000 = false;
+ } else {
+ jjtree.popNode();
+ }
+ if (jjte000 instanceof RuntimeException) {
+ {if (true) throw (RuntimeException)jjte000;}
+ }
+ if (jjte000 instanceof ParseException) {
+ {if (true) throw (ParseException)jjte000;}
+ }
+ {if (true) throw (Error)jjte000;}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -1076,6 +1098,16 @@
jj_consume_token(LBRACK);
Expression();
jj_consume_token(RBRACK);
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case LPAREN:
+ jj_consume_token(LPAREN);
+ Parameters();
+ jj_consume_token(RPAREN);
+ break;
+ default:
+ jj_la1[28] = jj_gen;
+ ;
+ }
} catch (Throwable jjte000) {
if (jjtc000) {
jjtree.clearNodeScope(jjtn000);
@@ -1098,6 +1130,27 @@
}
/*
+ * Parameters
+ * Method parameters
+ */
+ final public void Parameters() throws ParseException {
+ Expression();
+ label_10:
+ while (true) {
+ switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+ case COMMA:
+ ;
+ break;
+ default:
+ jj_la1[29] = jj_gen;
+ break label_10;
+ }
+ jj_consume_token(COMMA);
+ Expression();
+ }
+ }
+
+/*
* NonLiteral
* For Grouped Operations, Identifiers, and Functions
*/
@@ -1109,7 +1162,7 @@
jj_consume_token(RPAREN);
break;
default:
- jj_la1[27] = jj_gen;
+ jj_la1[30] = jj_gen;
if (jj_2_2(2147483647)) {
Function();
} else {
@@ -1118,7 +1171,7 @@
Identifier();
break;
default:
- jj_la1[28] = jj_gen;
+ jj_la1[31] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1186,22 +1239,22 @@
case MINUS:
case IDENTIFIER:
Expression();
- label_10:
+ label_11:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
break;
default:
- jj_la1[29] = jj_gen;
- break label_10;
+ jj_la1[32] = jj_gen;
+ break label_11;
}
jj_consume_token(COMMA);
Expression();
}
break;
default:
- jj_la1[30] = jj_gen;
+ jj_la1[33] = jj_gen;
;
}
jj_consume_token(RPAREN);
@@ -1249,7 +1302,7 @@
Null();
break;
default:
- jj_la1[31] = jj_gen;
+ jj_la1[34] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1286,7 +1339,7 @@
}
break;
default:
- jj_la1[32] = jj_gen;
+ jj_la1[35] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
}
@@ -1394,53 +1447,32 @@
finally { jj_save(2, xla); }
}
- private boolean jj_3R_24() {
- if (jj_3R_30()) return true;
- Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_31()) { jj_scanpos = xsp; break; }
- }
- return false;
- }
-
- private boolean jj_3R_12() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_scan_token(COLON)) return true;
- return false;
- }
-
private boolean jj_3_2() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_12()) jj_scanpos = xsp;
+ if (jj_3R_13()) jj_scanpos = xsp;
if (jj_scan_token(IDENTIFIER)) return true;
if (jj_scan_token(LPAREN)) return true;
return false;
}
- private boolean jj_3R_33() {
- if (jj_scan_token(MINUS)) return true;
- return false;
- }
-
- private boolean jj_3R_68() {
+ private boolean jj_3R_69() {
if (jj_scan_token(IDENTIFIER)) return true;
return false;
}
private boolean jj_3R_25() {
+ if (jj_3R_31()) return true;
Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_32()) {
- jj_scanpos = xsp;
- if (jj_3R_33()) return true;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_32()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_32() {
- if (jj_scan_token(PLUS)) return true;
+ private boolean jj_3R_59() {
+ if (jj_3R_69()) return true;
return false;
}
@@ -1449,42 +1481,62 @@
return false;
}
- private boolean jj_3R_20() {
- if (jj_3R_24()) return true;
+ private boolean jj_3R_34() {
+ if (jj_scan_token(MINUS)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_26() {
Token xsp;
- while (true) {
- xsp = jj_scanpos;
- if (jj_3R_25()) { jj_scanpos = xsp; break; }
+ xsp = jj_scanpos;
+ if (jj_3R_33()) {
+ jj_scanpos = xsp;
+ if (jj_3R_34()) return true;
}
return false;
}
- private boolean jj_3R_57() {
- if (jj_3R_67()) return true;
+ private boolean jj_3R_33() {
+ if (jj_scan_token(PLUS)) return true;
return false;
}
- private boolean jj_3R_56() {
+ private boolean jj_3R_57() {
if (jj_scan_token(LPAREN)) return true;
- if (jj_3R_66()) return true;
+ if (jj_3R_67()) return true;
return false;
}
- private boolean jj_3R_48() {
+ private boolean jj_3R_49() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_56()) {
- jj_scanpos = xsp;
if (jj_3R_57()) {
jj_scanpos = xsp;
- if (jj_3R_58()) return true;
+ if (jj_3R_58()) {
+ jj_scanpos = xsp;
+ if (jj_3R_59()) return true;
}
}
return false;
}
- private boolean jj_3R_29() {
+ private boolean jj_3R_66() {
+ if (jj_scan_token(NULL)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_21() {
+ if (jj_3R_25()) return true;
Token xsp;
+ while (true) {
+ xsp = jj_scanpos;
+ if (jj_3R_26()) { jj_scanpos = xsp; break; }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_30() {
+ Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(29)) {
jj_scanpos = xsp;
@@ -1494,11 +1546,11 @@
}
private boolean jj_3R_65() {
- if (jj_scan_token(NULL)) return true;
+ if (jj_scan_token(STRING_LITERAL)) return true;
return false;
}
- private boolean jj_3R_28() {
+ private boolean jj_3R_29() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(31)) {
@@ -1508,7 +1560,7 @@
return false;
}
- private boolean jj_3R_27() {
+ private boolean jj_3R_28() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(25)) {
@@ -1518,23 +1570,23 @@
return false;
}
- private boolean jj_3R_21() {
+ private boolean jj_3R_22() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_26()) {
- jj_scanpos = xsp;
if (jj_3R_27()) {
jj_scanpos = xsp;
if (jj_3R_28()) {
jj_scanpos = xsp;
- if (jj_3R_29()) return true;
+ if (jj_3R_29()) {
+ jj_scanpos = xsp;
+ if (jj_3R_30()) return true;
}
}
}
return false;
}
- private boolean jj_3R_26() {
+ private boolean jj_3R_27() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(27)) {
@@ -1544,37 +1596,37 @@
return false;
}
- private boolean jj_3R_60() {
+ private boolean jj_3R_61() {
if (jj_scan_token(LBRACK)) return true;
return false;
}
private boolean jj_3R_64() {
- if (jj_scan_token(STRING_LITERAL)) return true;
+ if (jj_scan_token(INTEGER_LITERAL)) return true;
return false;
}
- private boolean jj_3R_50() {
- if (jj_3R_60()) return true;
+ private boolean jj_3R_51() {
+ if (jj_3R_61()) return true;
return false;
}
- private boolean jj_3R_18() {
- if (jj_3R_20()) return true;
+ private boolean jj_3R_19() {
+ if (jj_3R_21()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_21()) { jj_scanpos = xsp; break; }
+ if (jj_3R_22()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_59() {
+ private boolean jj_3R_60() {
if (jj_scan_token(DOT)) return true;
return false;
}
- private boolean jj_3R_23() {
+ private boolean jj_3R_24() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(35)) {
@@ -1585,11 +1637,11 @@
}
private boolean jj_3R_63() {
- if (jj_scan_token(INTEGER_LITERAL)) return true;
+ if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
return false;
}
- private boolean jj_3R_22() {
+ private boolean jj_3R_23() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(33)) {
@@ -1599,17 +1651,17 @@
return false;
}
- private boolean jj_3R_19() {
+ private boolean jj_3R_20() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_22()) {
+ if (jj_3R_23()) {
jj_scanpos = xsp;
- if (jj_3R_23()) return true;
+ if (jj_3R_24()) return true;
}
return false;
}
- private boolean jj_3R_17() {
+ private boolean jj_3R_18() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(39)) {
@@ -1619,77 +1671,97 @@
return false;
}
- private boolean jj_3R_49() {
- if (jj_3R_59()) return true;
+ private boolean jj_3R_71() {
+ if (jj_scan_token(FALSE)) return true;
return false;
}
- private boolean jj_3R_46() {
+ private boolean jj_3R_50() {
+ if (jj_3R_60()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_47() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_49()) {
+ if (jj_3R_50()) {
jj_scanpos = xsp;
- if (jj_3R_50()) return true;
+ if (jj_3R_51()) return true;
}
return false;
}
- private boolean jj_3R_16() {
- if (jj_3R_18()) return true;
+ private boolean jj_3R_17() {
+ if (jj_3R_19()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_19()) { jj_scanpos = xsp; break; }
+ if (jj_3R_20()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_62() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+ private boolean jj_3R_44() {
+ if (jj_3R_47()) return true;
return false;
}
- private boolean jj_3R_43() {
- if (jj_3R_46()) return true;
+ private boolean jj_3R_70() {
+ if (jj_scan_token(TRUE)) return true;
return false;
}
- private boolean jj_3R_45() {
- if (jj_3R_48()) return true;
+ private boolean jj_3R_62() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_70()) {
+ jj_scanpos = xsp;
+ if (jj_3R_71()) return true;
+ }
return false;
}
- private boolean jj_3R_70() {
- if (jj_scan_token(FALSE)) return true;
+ private boolean jj_3R_46() {
+ if (jj_3R_49()) return true;
return false;
}
- private boolean jj_3R_44() {
- if (jj_3R_47()) return true;
+ private boolean jj_3R_45() {
+ if (jj_3R_48()) return true;
return false;
}
- private boolean jj_3R_14() {
- if (jj_3R_16()) return true;
+ private boolean jj_3R_15() {
+ if (jj_3R_17()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_17()) { jj_scanpos = xsp; break; }
+ if (jj_3R_18()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_42() {
+ private boolean jj_3R_43() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_44()) {
+ if (jj_3R_45()) {
jj_scanpos = xsp;
- if (jj_3R_45()) return true;
+ if (jj_3R_46()) return true;
}
return false;
}
- private boolean jj_3R_15() {
+ private boolean jj_3R_56() {
+ if (jj_3R_66()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_55() {
+ if (jj_3R_65()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_16() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(41)) {
@@ -1699,105 +1771,80 @@
return false;
}
- private boolean jj_3R_69() {
- if (jj_scan_token(TRUE)) return true;
+ private boolean jj_3R_54() {
+ if (jj_3R_64()) return true;
return false;
}
- private boolean jj_3R_61() {
+ private boolean jj_3R_53() {
+ if (jj_3R_63()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_52() {
+ if (jj_3R_62()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_48() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_69()) {
+ if (jj_3R_52()) {
jj_scanpos = xsp;
- if (jj_3R_70()) return true;
+ if (jj_3R_53()) {
+ jj_scanpos = xsp;
+ if (jj_3R_54()) {
+ jj_scanpos = xsp;
+ if (jj_3R_55()) {
+ jj_scanpos = xsp;
+ if (jj_3R_56()) return true;
}
+ }
+ }
+ }
return false;
}
- private boolean jj_3R_13() {
- if (jj_3R_14()) return true;
+ private boolean jj_3R_14() {
+ if (jj_3R_15()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_15()) { jj_scanpos = xsp; break; }
+ if (jj_3R_16()) { jj_scanpos = xsp; break; }
}
return false;
}
- private boolean jj_3R_41() {
- if (jj_3R_42()) return true;
+ private boolean jj_3R_42() {
+ 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_55() {
- if (jj_3R_65()) return true;
- return false;
- }
-
- private boolean jj_3R_54() {
- if (jj_3R_64()) return true;
- return false;
- }
-
- private boolean jj_3R_53() {
- if (jj_3R_63()) return true;
- return false;
- }
-
private boolean jj_3_1() {
if (jj_scan_token(QUESTIONMARK)) return true;
- if (jj_3R_11()) return true;
+ if (jj_3R_12()) return true;
if (jj_scan_token(COLON)) return true;
return false;
}
- private boolean jj_3R_52() {
- if (jj_3R_62()) return true;
+ private boolean jj_3R_38() {
+ if (jj_3R_42()) return true;
return false;
}
private boolean jj_3R_37() {
- if (jj_3R_41()) return true;
- return false;
- }
-
- private boolean jj_3R_51() {
- if (jj_3R_61()) return true;
- return false;
- }
-
- 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()) {
- jj_scanpos = xsp;
- if (jj_3R_55()) return true;
- }
- }
- }
- }
- return false;
- }
-
- private boolean jj_3R_36() {
if (jj_scan_token(EMPTY)) return true;
- if (jj_3R_30()) return true;
+ if (jj_3R_31()) return true;
return false;
}
- private boolean jj_3R_11() {
- if (jj_3R_13()) return true;
+ private boolean jj_3R_12() {
+ if (jj_3R_14()) return true;
Token xsp;
while (true) {
xsp = jj_scanpos;
@@ -1806,47 +1853,62 @@
return false;
}
- private boolean jj_3R_35() {
+ private boolean jj_3R_36() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(37)) {
jj_scanpos = xsp;
if (jj_scan_token(38)) return true;
}
- if (jj_3R_30()) return true;
+ if (jj_3R_31()) return true;
return false;
}
- private boolean jj_3R_30() {
+ private boolean jj_3R_31() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_34()) {
- jj_scanpos = xsp;
if (jj_3R_35()) {
jj_scanpos = xsp;
if (jj_3R_36()) {
jj_scanpos = xsp;
- if (jj_3R_37()) return true;
+ if (jj_3R_37()) {
+ jj_scanpos = xsp;
+ if (jj_3R_38()) return true;
}
}
}
return false;
}
- private boolean jj_3R_34() {
+ private boolean jj_3R_35() {
if (jj_scan_token(MINUS)) return true;
- if (jj_3R_30()) return true;
+ if (jj_3R_31()) return true;
return false;
}
- private boolean jj_3R_66() {
- if (jj_3R_11()) return true;
+ private boolean jj_3_3() {
+ if (jj_scan_token(IDENTIFIER)) return true;
+ if (jj_scan_token(COLON)) return true;
return false;
}
- private boolean jj_3R_40() {
+ private boolean jj_3R_68() {
Token xsp;
xsp = jj_scanpos;
+ if (jj_3_3()) jj_scanpos = xsp;
+ if (jj_scan_token(IDENTIFIER)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_67() {
+ if (jj_3R_12()) return true;
+ return false;
+ }
+
+ private boolean jj_3R_41() {
+ Token xsp;
+ xsp = jj_scanpos;
if (jj_scan_token(51)) {
jj_scanpos = xsp;
if (jj_scan_token(52)) return true;
@@ -1854,7 +1916,7 @@
return false;
}
- private boolean jj_3R_39() {
+ private boolean jj_3R_40() {
Token xsp;
xsp = jj_scanpos;
if (jj_scan_token(49)) {
@@ -1864,39 +1926,30 @@
return false;
}
- private boolean jj_3_3() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_scan_token(COLON)) return true;
- return false;
- }
-
- private boolean jj_3R_67() {
+ private boolean jj_3R_32() {
Token xsp;
xsp = jj_scanpos;
- if (jj_3_3()) jj_scanpos = xsp;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
- private boolean jj_3R_31() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_38()) {
- jj_scanpos = xsp;
if (jj_3R_39()) {
jj_scanpos = xsp;
- if (jj_3R_40()) return true;
+ if (jj_3R_40()) {
+ jj_scanpos = xsp;
+ if (jj_3R_41()) return true;
}
}
return false;
}
- private boolean jj_3R_38() {
+ private boolean jj_3R_39() {
if (jj_scan_token(MULT)) return true;
return false;
}
+ private boolean jj_3R_13() {
+ if (jj_scan_token(IDENTIFIER)) return true;
+ if (jj_scan_token(COLON)) return true;
+ return false;
+ }
+
/** Generated Token Manager. */
public ELParserTokenManager token_source;
SimpleCharStream jj_input_stream;
@@ -1908,7 +1961,7 @@
private Token jj_scanpos, jj_lastpos;
private int jj_la;
private int jj_gen;
- final private int[] jj_la1 = new int[33];
+ final private int[] jj_la1 = new int[36];
static private int[] jj_la1_0;
static private int[] jj_la1_1;
static {
@@ -1916,10 +1969,10 @@
jj_la1_init_1();
}
private static void jj_la1_init_0() {
- jj_la1_0 = new int[]
{0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000000,0x18000000,0x6000000,0x80000000,0x60000000,0xfe000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9d600,0x240000,0x9d600,0x240000,0x80000,0x0,0x1000000,0x9d600,0x1d600,0xc000,};
+ jj_la1_0 = new int[]
{0xe,0xe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000000,0x18000000,0x6000000,0x80000000,0x60000000,0xfe000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9d600,0x240000,0x9d600,0x240000,0x80000,0x80000,0x1000000,0x80000,0x0,0x1000000,0x9d600,0x1d600,0xc000,};
}
private static void jj_la1_init_1() {
- jj_la1_1 = new int[]
{0x0,0x0,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x60000,0x180000,0x1e2000,0x60,0x208860,0x0,0x200000,0x0,0x0,0x200000,0x0,0x208860,0x0,0x0,};
+ jj_la1_1 = new int[]
{0x0,0x0,0x600,0x600,0x180,0x180,0x1e,0x6,0x18,0x1e,0x1,0x0,0x0,0x1,0x0,0x1,0xc000,0xc000,0x1e2000,0x60000,0x180000,0x1e2000,0x60,0x208860,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x208860,0x0,0x0,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[3];
private boolean jj_rescan = false;
@@ -1936,7 +1989,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 33; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1952,7 +2005,7 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 33; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1963,7 +2016,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 33; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1975,7 +2028,7 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 33; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1985,7 +2038,7 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 33; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -1996,7 +2049,7 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 33; i++) jj_la1[i] = -1;
+ for (int i = 0; i < 36; i++) jj_la1[i] = -1;
for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
}
@@ -2113,7 +2166,7 @@
la1tokens[jj_kind] = true;
jj_kind = -1;
}
- for (int i = 0; i < 33; i++) {
+ for (int i = 0; i < 36; i++) {
if (jj_la1[i] == jj_gen) {
for (int j = 0; j < 32; j++) {
if ((jj_la1_0[i] & (1<<j)) != 0) {
Modified: trunk/java/org/apache/el/parser/ELParser.jjt
===================================================================
--- trunk/java/org/apache/el/parser/ELParser.jjt 2009-11-21 02:42:29 UTC (rev 1282)
+++ trunk/java/org/apache/el/parser/ELParser.jjt 2009-11-21 03:06:09 UTC (rev 1283)
@@ -19,6 +19,11 @@
Author: Jacob Hookom
Email: jacob at
hookom.net
*/
+/*
+ Building:
+ jjtree ELParser.jjt
+ javacc ELParser.jj
+*/
/* == Option Declaration == */
options