Author: markt
Date: Mon Jul 15 08:19:09 2013
New Revision: 1503132
URL: http://svn.apache.org/r1503132
Log:
kkolinko review of r1503056
Modified:
tomcat/trunk/java/org/apache/el/Messages.properties
tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java
tomcat/trunk/test/org/apache/el/parser/TestAstLambdaExpression.java
Modified: tomcat/trunk/java/org/apache/el/Messages.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/Messages.properties?rev=1503132&r1=1503131&r2=1503132&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/Messages.properties (original)
+++ tomcat/trunk/java/org/apache/el/Messages.properties Mon Jul 15 08:19:09 2013
@@ -54,4 +54,4 @@ error.context.null=ELContext was null
error.identifier.notjava=The identifier [{0}] is not a valid Java identifier
as required by section 1.19 of the EL specification (Identifier ::= Java
language identifier). This check can be disabled by setting the system property
org.apache.el.parser.SKIP_IDENTIFIER_CHECK to true.
# AstLambdaExpression
-error.args.tooFew=Only [{0}] arguments were provided for a lambda expression
that requires at least [{1}]
+error.lambda.args.tooFew=Only [{0}] arguments were provided for a lambda
expression that requires at least [{1}]
Modified: tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java?rev=1503132&r1=1503131&r2=1503132&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLambdaExpression.java Mon Jul 15
08:19:09 2013
@@ -49,18 +49,18 @@ public class AstLambdaExpression extends
argCount = paramValues.length;
}
if (paramCount > argCount) {
- throw new ELException(MessageFactory.get("error.args.tooFew",
+ throw new
ELException(MessageFactory.get("error.lamdba.args.tooFew",
Integer.valueOf(argCount), Integer.valueOf(paramCount)));
}
// Build the argument map
- Map<String,Object> lambdaArgumnents = new HashMap<>();
+ Map<String,Object> lambdaArguments = new HashMap<>();
for (int i = 0; i < paramCount; i++) {
- lambdaArgumnents.put(formalParameters.children[i].getImage(),
+ lambdaArguments.put(formalParameters.children[i].getImage(),
paramValues[i]);
}
- ctx.enterLambdaScope(lambdaArgumnents);
+ ctx.enterLambdaScope(lambdaArguments);
try {
return children[1].getValue(ctx);
Modified: tomcat/trunk/test/org/apache/el/parser/TestAstLambdaExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/parser/TestAstLambdaExpression.java?rev=1503132&r1=1503131&r2=1503132&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/parser/TestAstLambdaExpression.java
(original)
+++ tomcat/trunk/test/org/apache/el/parser/TestAstLambdaExpression.java Mon Jul
15 08:19:09 2013
@@ -45,4 +45,15 @@ public class TestAstLambdaExpression {
Object result = processor.getValue("(()->64)", Integer.class);
Assert.assertEquals(Integer.valueOf(64), result);
}
+
+
+ @Test
+ public void testSpec04() {
+ ELProcessor processor = new ELProcessor();
+ Object result =
+ processor.getValue("v = (x,y)->x+y; v(3,4)", Integer.class);
+ Assert.assertEquals(Integer.valueOf(7), result);
+ }
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
