From bf37aaf686d39d68a6dbcbda7d85109a17f2f98a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 14 Jan 2010 22:45:02 +0000
Subject: [PATCH] Updated the generated code after r899450

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@899451 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/el/parser/ELParser.java            | 86 ++++++++++++++--------
 .../apache/el/parser/ELParserTreeConstants.java    | 20 ++---
 2 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/java/org/apache/el/parser/ELParser.java b/java/org/apache/el/parser/ELParser.java
index a3aac6c31..e4e260de4 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -1109,40 +1109,64 @@ public class ELParser/*@bgen(jjtree)*/implements ELParserTreeConstants, ELParser
  * 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);
   }
 
 /*
diff --git a/java/org/apache/el/parser/ELParserTreeConstants.java b/java/org/apache/el/parser/ELParserTreeConstants.java
index 87e352268..892ee5e9f 100644
--- a/java/org/apache/el/parser/ELParserTreeConstants.java
+++ b/java/org/apache/el/parser/ELParserTreeConstants.java
@@ -28,14 +28,15 @@ public interface ELParserTreeConstants
   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 @@ public interface ELParserTreeConstants
     "Value",
     "DotSuffix",
     "BracketSuffix",
+    "MethodParameters",
     "Identifier",
     "Function",
     "True",
@@ -74,4 +76,4 @@ public interface ELParserTreeConstants
     "Null",
   };
 }
-/* JavaCC - OriginalChecksum=5af14271a4fcdc582f7dce53f6c6146d (do not edit this line) */
+/* JavaCC - OriginalChecksum=57a11486271882e4bdcb1543fa567329 (do not edit this line) */
-- 
2.11.0