From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 18 Sep 2008 19:42:54 +0000 (+0000)
Subject: Add explicit lookaheads where they could be ambiguity. This resolves some TCK failure... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7929bba95652af9ebe5364033d4adc1480d0cdc8;p=tomcat7.0

Add explicit lookaheads where they could be ambiguity. This resolves some TCK failures with the fix for 42565.

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 ae3b7d718..63bfe83b5 100644
--- 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);