svn commit: r685701 - /tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt

[markt]

Author: markt
Date: Wed Aug 13 15:14:33 2008
New Revision: 685701

URL: http://svn.apache.org/viewvc?rev=685701&view=rev
Log:
Better fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=42565

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

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt?rev=685701&r1=685700&r2=685701&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt Wed Aug 13 
15:14:33 2008
@@ -255,7 +255,7 @@
 void NonLiteral() : {}
 {
        <LPAREN> Expression() <RPAREN>
-       | LOOKAHEAD(3) Function()
+       | LOOKAHEAD((<IDENTIFIER> <COLON>)? <IDENTIFIER> <LPAREN>) Function()
        | Identifier()
 }
 
@@ -278,7 +278,7 @@
        Token t1 = null;
 }
 {
-       (t0=<NAMESPACE>)? t1=<IDENTIFIER>
+       (t0=<IDENTIFIER> <COLON>)? t1=<IDENTIFIER>
        {
                if (t0 != null) {
                        jjtThis.setPrefix(t0.image.substring(0, 
t0.image.length() - 1));
@@ -428,7 +428,6 @@
 |      < MOD0 : "%" >
 |      < MOD1 : "mod" >
 |      < IDENTIFIER : (<LETTER>|<IMPL_OBJ_START>) (<LETTER>|<DIGIT>)* >
-|   < NAMESPACE : (<IDENTIFIER> (<IDENTIFIER>|<MINUS>|<DOT>)* <COLON>) >
 |      < FUNCTIONSUFFIX : (<IDENTIFIER>) >
 |      < #IMPL_OBJ_START: "#" >
 |      < #LETTER:



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]