svn commit: r1571242 - /tomcat/trunk/java/org/apache/el/parser/ELParser.jjt

[markt]

Author: markt
Date: Mon Feb 24 11:13:26 2014
New Revision: 1571242

URL: http://svn.apache.org/r1571242
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56179
Supporting lambda expressions requires additional lookaheads to ensure the 
correct grammar is used.

Modified:
    tomcat/trunk/java/org/apache/el/parser/ELParser.jjt

Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?rev=1571242&r1=1571241&r2=1571242&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Mon Feb 24 11:13:26 2014
@@ -112,7 +112,7 @@ void Semicolon() : {}
  */
 void Assignment() : {}
 {
-    LOOKAHEAD(3) LambdaExpression() |
+    LOOKAHEAD(4) LambdaExpression() |
     Choice() ( LOOKAHEAD(2) <ASSIGN> Assignment() #Assign(2) )*
 }
 
@@ -323,7 +323,7 @@ void MethodParameters() #MethodParameter
  */
 void NonLiteral() : {}
 {
-    LOOKAHEAD(3) LambdaExpressionOrInvocation()
+    LOOKAHEAD(5) LambdaExpressionOrInvocation()
     | <LPAREN> Expression() <RPAREN>
     | LOOKAHEAD((<IDENTIFIER> <COLON>)? <IDENTIFIER> <LPAREN>) Function()
     | Identifier()



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org