Author: markt
Date: Wed Aug 13 15:12:05 2008
New Revision: 685699
URL: http://svn.apache.org/viewvc?rev=685699&view=rev
Log:
Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=42565 since
it caused https://issues.apache.org/bugzilla/show_bug.cgi?id=45511
A better fix for 42565 will follow
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=685699&r1=685698&r2=685699&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:12:05 2008
@@ -31,7 +31,7 @@
NODE_DEFAULT_VOID=true;
JAVA_UNICODE_ESCAPE=false;
UNICODE_INPUT=true;
- BUILD_NODE_FILES=false;
+ BUILD_NODE_FILES=true;
}
/* == Parser Declaration == */
@@ -274,19 +274,20 @@
*/
void Function() #Function :
{
- Token tx = null;
+ Token t0 = null;
+ Token t1 = null;
}
{
- (tx=<FUNCTION_CALL>) (Expression() (<COMMA> Expression())*)? <RPAREN>
+ (t0=<NAMESPACE>)? t1=<IDENTIFIER>
{
- int split = tx.image.indexOf(":");
- if (split!=-1) {
- jjtThis.setPrefix(tx.image.substring(0, split));
- jjtThis.setLocalName(tx.image.substring(split + 1,
tx.image.length() - 1));
+ if (t0 != null) {
+ jjtThis.setPrefix(t0.image.substring(0,
t0.image.length() - 1));
+ jjtThis.setLocalName(t1.image);
} else {
- jjtThis.setLocalName(tx.image.substring(0,
tx.image.length() - 1));
+ jjtThis.setLocalName(t1.image);
}
}
+ <LPAREN> (Expression() (<COMMA> Expression())*)? <RPAREN>
}
/*
@@ -427,9 +428,7 @@
| < MOD0 : "%" >
| < MOD1 : "mod" >
| < IDENTIFIER : (<LETTER>|<IMPL_OBJ_START>) (<LETTER>|<DIGIT>)* >
-| < #NAMESPACE : ( <NAMESPACE_NAME> <COLON>) >
-| < #NAMESPACE_NAME: (<IDENTIFIER> (<LETTER>|<DIGIT>|<MINUS>|<DOT>)*) >
-| < FUNCTION_CALL: (<NAMESPACE>)? <IDENTIFIER> <LPAREN> >
+| < 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]
