Author: markt
Date: Sun Jan 10 12:47:49 2010
New Revision: 897629
URL: http://svn.apache.org/viewvc?rev=897629&view=rev
Log:
Fix a bug found during review.
Whilst the old version is what is defined in the spec, the definition in the
spec does not agree with the description and associatedcomments in the spec. I
have raised this as https://uel.dev.java.net/issues/show_bug.cgi?id=10
Modify the parser on the basis that the textual description and comments in the
spec are correct and the production for StringLiteral is wrong
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=897629&r1=897628&r2=897629&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Sun Jan 10 12:47:49 2010
@@ -383,9 +383,9 @@
>
| < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
| < STRING_LITERAL: ("\"" ((~["\"","\\"])
- | ("\\" ( ["\\","\""] )))* "\"")
+ | ("\\" ( ["\\","\"","\'"] )))* "\"")
| ("\'" ((~["\'","\\"])
- | ("\\" ( ["\\","\'"] )))* "\'")
+ | ("\\" ( ["\\","\"","\'"] )))* "\'")
>
| < BADLY_ESCAPED_STRING_LITERAL: ("\"" (~["\"","\\"])* ("\\" (
~["\\","\""] )))
| ("\'" (~["\'","\\"])* ("\\" ( ~["\\","\'"] )))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
