Author: markt
Date: Thu Jan 14 22:45:02 2010
New Revision: 899451
URL: http://svn.apache.org/viewvc?rev=899451&view=rev
Log:
Updated the generated code after r899450
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.java
tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.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=899451&r1=899450&r2=899451&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Thu Jan 14 22:45:02
2010
@@ -1109,40 +1109,64 @@
* 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);
+ /*...@bgen(jjtree)
MethodParameters */
+ AstMethodParameters jjtn000 = new AstMethodParameters(JJTMETHODPARAMETERS);
+ boolean jjtc000 = true;
+ jjtree.openNodeScope(jjtn000);
+ try {
+ 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);
+ } 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);
}
- break;
- default:
- jj_la1[29] = jj_gen;
- ;
}
- jj_consume_token(RPAREN);
}
/*
Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java?rev=899451&r1=899450&r2=899451&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java Thu Jan
14 22:45:02 2010
@@ -28,14 +28,15 @@
public int JJTVALUE = 22;
public int JJTDOTSUFFIX = 23;
public int JJTBRACKETSUFFIX = 24;
- public int JJTIDENTIFIER = 25;
- public int JJTFUNCTION = 26;
- public int JJTTRUE = 27;
- public int JJTFALSE = 28;
- public int JJTFLOATINGPOINT = 29;
- public int JJTINTEGER = 30;
- public int JJTSTRING = 31;
- public int JJTNULL = 32;
+ public int JJTMETHODPARAMETERS = 25;
+ public int JJTIDENTIFIER = 26;
+ public int JJTFUNCTION = 27;
+ public int JJTTRUE = 28;
+ public int JJTFALSE = 29;
+ public int JJTFLOATINGPOINT = 30;
+ public int JJTINTEGER = 31;
+ public int JJTSTRING = 32;
+ public int JJTNULL = 33;
public String[] jjtNodeName = {
@@ -64,6 +65,7 @@
"Value",
"DotSuffix",
"BracketSuffix",
+ "MethodParameters",
"Identifier",
"Function",
"True",
@@ -74,4 +76,4 @@
"Null",
};
}
-/* JavaCC - OriginalChecksum=5af14271a4fcdc582f7dce53f6c6146d (do not edit
this line) */
+/* JavaCC - OriginalChecksum=57a11486271882e4bdcb1543fa567329 (do not edit
this line) */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
