Author: markt Date: Wed Jan 13 18:05:59 2010 New Revision: 898865 URL: http://svn.apache.org/viewvc?rev=898865&view=rev Log: Updated autogenerated code after r898864
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java 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=898865&r1=898864&r2=898865&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original) +++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Wed Jan 13 18:05:59 2010 @@ -1039,6 +1039,14 @@ jj_consume_token(-1); throw new ParseException(); } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LPAREN: + MethodParameters(); + break; + default: + jj_la1[27] = jj_gen; + ; + } } /* @@ -1098,6 +1106,46 @@ } /* + * MethodParameters + */ + final public void MethodParameters() throws ParseException { + jj_consume_token(LPAREN); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INTEGER_LITERAL: + case FLOATING_POINT_LITERAL: + case STRING_LITERAL: + case TRUE: + case FALSE: + case NULL: + case LPAREN: + case NOT0: + case NOT1: + case EMPTY: + case MINUS: + case IDENTIFIER: + Expression(); + label_10: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case COMMA: + ; + break; + default: + jj_la1[28] = jj_gen; + break label_10; + } + jj_consume_token(COMMA); + Expression(); + } + break; + default: + jj_la1[29] = jj_gen; + ; + } + jj_consume_token(RPAREN); + } + +/* * NonLiteral * For Grouped Operations, Identifiers, and Functions */ @@ -1109,7 +1157,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 +1166,7 @@ Identifier(); break; default: - jj_la1[28] = jj_gen; + jj_la1[31] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1186,22 +1234,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 +1297,7 @@ Null(); break; default: - jj_la1[31] = jj_gen; + jj_la1[34] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1286,7 +1334,7 @@ } break; default: - jj_la1[32] = jj_gen; + jj_la1[35] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1394,17 +1442,7 @@ 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() { + private boolean jj_3R_13() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(COLON)) return true; return false; @@ -1413,34 +1451,34 @@ 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; + } + + private boolean jj_3R_34() { + if (jj_scan_token(MINUS)) return true; return false; } @@ -1449,41 +1487,56 @@ return false; } - private boolean jj_3R_20() { - if (jj_3R_24()) return true; + 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(27)) { @@ -1494,11 +1547,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(29)) { @@ -1508,7 +1561,7 @@ return false; } - private boolean jj_3R_27() { + private boolean jj_3R_28() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(23)) { @@ -1518,23 +1571,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(25)) { @@ -1544,37 +1597,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; + private boolean jj_3R_51() { + if (jj_3R_61()) return true; return false; } - private boolean jj_3R_50() { - if (jj_3R_60()) return true; + private boolean jj_3R_64() { + if (jj_scan_token(INTEGER_LITERAL)) 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(33)) { @@ -1585,11 +1638,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(31)) { @@ -1599,17 +1652,22 @@ 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_50() { + if (jj_3R_60()) return true; + return false; + } + + private boolean jj_3R_18() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(37)) { @@ -1619,117 +1677,92 @@ return false; } - private boolean jj_3R_49() { - if (jj_3R_59()) return true; - return false; - } - - private boolean jj_3R_46() { + 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_71() { + if (jj_scan_token(FALSE)) return true; + return false; + } + + 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; } - } - return false; - } - - private boolean jj_3R_42() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_44()) { - jj_scanpos = xsp; - if (jj_3R_45()) return true; + if (jj_3R_18()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_15() { + private boolean jj_3R_43() { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(39)) { + if (jj_3R_45()) { jj_scanpos = xsp; - if (jj_scan_token(40)) return true; + if (jj_3R_46()) return true; } return false; } - private boolean jj_3R_69() { - if (jj_scan_token(TRUE)) return true; + private boolean jj_3R_56() { + if (jj_3R_66()) return true; return false; } - private boolean jj_3R_61() { + private boolean jj_3R_16() { Token xsp; xsp = jj_scanpos; - if (jj_3R_69()) { + if (jj_scan_token(39)) { jj_scanpos = xsp; - if (jj_3R_70()) return true; - } - return false; - } - - private boolean jj_3R_13() { - if (jj_3R_14()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_15()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_41() { - if (jj_3R_42()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_43()) { jj_scanpos = xsp; break; } + if (jj_scan_token(40)) return true; } return false; } @@ -1749,40 +1782,23 @@ return false; } - private boolean jj_3_1() { - if (jj_scan_token(QUESTIONMARK)) return true; - if (jj_3R_11()) return true; - if (jj_scan_token(COLON)) return true; - return false; - } - private boolean jj_3R_52() { if (jj_3R_62()) 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() { + private boolean jj_3R_48() { 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; + if (jj_3R_55()) { + jj_scanpos = xsp; + if (jj_3R_56()) return true; } } } @@ -1790,14 +1806,46 @@ return false; } - private boolean jj_3R_36() { + private boolean jj_3R_14() { + if (jj_3R_15()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_16()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_42() { + if (jj_3R_43()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_44()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3_1() { + if (jj_scan_token(QUESTIONMARK)) return true; + if (jj_3R_12()) return true; + if (jj_scan_token(COLON)) return true; + return false; + } + + private boolean jj_3R_38() { + if (jj_3R_42()) return true; + return false; + } + + private boolean jj_3R_37() { 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,45 +1854,60 @@ return false; } - private boolean jj_3R_35() { + private boolean jj_3R_36() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(35)) { jj_scanpos = xsp; if (jj_scan_token(36)) 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(49)) { @@ -1854,7 +1917,7 @@ return false; } - private boolean jj_3R_39() { + private boolean jj_3R_40() { Token xsp; xsp = jj_scanpos; if (jj_scan_token(47)) { @@ -1864,35 +1927,20 @@ 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() { - 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() { + private boolean jj_3R_32() { 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; } @@ -1908,7 +1956,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 +1964,10 @@ jj_la1_init_1(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0xe,0xe,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x80000000,0x7f800000,0x6000000,0x1800000,0x60000000,0x18000000,0x7f800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x27b00,0x90000,0x27b00,0x90000,0x20000,0x0,0x400000,0x27b00,0x7b00,0x3000,}; + jj_la1_0 = new int[] {0xe,0xe,0x0,0x0,0x0,0x0,0x80000000,0x80000000,0x0,0x80000000,0x7f800000,0x6000000,0x1800000,0x60000000,0x18000000,0x7f800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x27b00,0x90000,0x27b00,0x90000,0x20000,0x400000,0x27b00,0x20000,0x0,0x400000,0x27b00,0x7b00,0x3000,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x0,0x0,0x180,0x180,0x60,0x60,0x7,0x1,0x6,0x7,0x0,0x0,0x0,0x0,0x0,0x0,0x3000,0x3000,0x78800,0x18000,0x60000,0x78800,0x18,0x82218,0x0,0x80000,0x0,0x0,0x80000,0x0,0x82218,0x0,0x0,}; + jj_la1_1 = new int[] {0x0,0x0,0x180,0x180,0x60,0x60,0x7,0x1,0x6,0x7,0x0,0x0,0x0,0x0,0x0,0x0,0x3000,0x3000,0x78800,0x18000,0x60000,0x78800,0x18,0x82218,0x0,0x80000,0x0,0x0,0x0,0x82218,0x0,0x80000,0x0,0x82218,0x0,0x0,}; } final private JJCalls[] jj_2_rtns = new JJCalls[3]; private boolean jj_rescan = false; @@ -1936,7 +1984,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 +2000,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 +2011,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 +2023,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 +2033,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 +2044,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 +2161,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) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org