Implement method invocation with parameters

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@898864 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/el/parser/AstBracketSuffix.java b/java/org/apache/el/parser/AstBracketSuffix.java
index 93216a0..9f5d792 100644 (file)
--- a/java/org/apache/el/parser/AstBracketSuffix.java
+++ b/java/org/apache/el/parser/AstBracketSuffix.java
@@ -27,7 +27,7 @@ import org.apache.el.lang.EvaluationContext;
  * @author Jacob Hookom [jacob@hookom.net]
  * @version $Change: 181177 $$Date$$Author$
  */
-public final class AstBracketSuffix extends SimpleNode {
+public final class AstBracketSuffix extends SimpleNode implements Suffix {
     public AstBracketSuffix(int id) {
         super(id);
     }

diff --git a/java/org/apache/el/parser/AstDotSuffix.java b/java/org/apache/el/parser/AstDotSuffix.java
index ea64fec..2eaaac2 100644 (file)
--- a/java/org/apache/el/parser/AstDotSuffix.java
+++ b/java/org/apache/el/parser/AstDotSuffix.java
@@ -27,7 +27,7 @@ import org.apache.el.lang.EvaluationContext;
  * @author Jacob Hookom [jacob@hookom.net]
  * @version $Change: 181177 $$Date$$Author$
  */
-public final class AstDotSuffix extends SimpleNode {
+public final class AstDotSuffix extends SimpleNode implements Suffix {
     public AstDotSuffix(int id) {
         super(id);
     }

diff --git a/java/org/apache/el/parser/AstValue.java b/java/org/apache/el/parser/AstValue.java
index 834fe48..ef63eac 100644 (file)
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -20,6 +20,7 @@ package org.apache.el.parser;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 
 import javax.el.ELException;
 import javax.el.ELResolver;
@@ -109,17 +110,34 @@ public final class AstValue extends SimpleNode {
         Object base = this.children[0].getValue(ctx);
         int propCount = this.jjtGetNumChildren();
         int i = 1;
-        Object property = null;
+        Object suffix = null;
         ELResolver resolver = ctx.getELResolver();
         while (base != null && i < propCount) {
-            property = this.children[i].getValue(ctx);
-            if (property == null) {
-                return null;
+            suffix = this.children[i].getValue(ctx);
+            if (i + 1 < propCount && !(this.children[i+1] instanceof Suffix)) {
+                // Looking for a method
+                ArrayList<Object> params = new ArrayList<Object>();
+                ArrayList<Class<?>> paramTypes = new ArrayList<Class<?>>();
+                while (i + 1 < propCount &&
+                        !(this.children[i+1] instanceof Suffix)) {
+                    params.add(this.children[i+1].getValue(ctx));
+                    paramTypes.add(this.children[i+1].getType(ctx));
+                    i++;
+                }
+                base = resolver.invoke(ctx, base, suffix,
+                        paramTypes.toArray(new Class<?>[paramTypes.size()]),
+                        params.toArray(new Object[params.size()]));
+                i++;
             } else {
-                ctx.setPropertyResolved(false);
-                base = resolver.getValue(ctx, base, property);
+                // Looking for a property
+                if (suffix == null) {
+                    return null;
+                } else {
+                    ctx.setPropertyResolved(false);
+                    base = resolver.getValue(ctx, base, suffix);
+                }
+                i++;
             }
-            i++;
         }
         return base;
     }

diff --git a/java/org/apache/el/parser/ELParser.jjt b/java/org/apache/el/parser/ELParser.jjt
index d559ee9..cd52ebf 100644 (file)
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -227,7 +227,7 @@ void ValuePrefix() : {}
  */
 void ValueSuffix() : {}
 {
-    DotSuffix() | BracketSuffix()
+    ( DotSuffix() | BracketSuffix() ) ( MethodParameters())?
 }
 
 /*
@@ -249,6 +249,14 @@ void BracketSuffix() #BracketSuffix : {}
 }
 
 /*
+ * MethodParameters
+ */
+void MethodParameters() : {}
+{
+    <LPAREN> ( Expression() ( <COMMA> Expression())* )? <RPAREN>
+}
+
+/*
  * NonLiteral
  * For Grouped Operations, Identifiers, and Functions
  */

diff --git a/java/org/apache/el/parser/Suffix.java b/java/org/apache/el/parser/Suffix.java
new file mode 100644 (file)
index 0000000..eecd2ea
--- /dev/null
+++ b/java/org/apache/el/parser/Suffix.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.el.parser;
+
+/**
+ * Marker interface used to simplfy the implementation of
+ * {@link AstValue#getValue(org.apache.el.lang.EvaluationContext). 
+ */
+public interface Suffix {
+    // Marker interface - defines no methods
+}