Add explicit lookaheads where they could be ambiguity. This resolves some TCK failure...

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

diff --git a/java/org/apache/el/parser/ELParser.jjt b/java/org/apache/el/parser/ELParser.jjt
index ae3b7d7..63bfe83 100644 (file)
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -104,7 +104,7 @@ void Expression() : {}
  */
 void Choice() : {}
 {
-    Or() (<QUESTIONMARK> Choice() <COLON> Choice() #Choice(3))*
+    Or() (LOOKAHEAD(3) <QUESTIONMARK> Choice() <COLON> Choice() #Choice(3))*
 }
 
 /*
@@ -278,7 +278,7 @@ void Function() #Function :
     Token t1 = null;
 }
 {
-    (t0=<IDENTIFIER> <COLON>)? t1=<IDENTIFIER>
+    (LOOKAHEAD(2) t0=<IDENTIFIER> <COLON>)? t1=<IDENTIFIER>
     {
         if (t0 != null) {
             jjtThis.setPrefix(t0.image);