From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 10 Jan 2010 12:47:49 +0000 (+0000)
Subject: Fix a bug found during review.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=116b0a3a2b423de1b350b336ce6f107936b6ad59;p=tomcat7.0

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


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

diff --git a/java/org/apache/el/parser/ELParser.jjt b/java/org/apache/el/parser/ELParser.jjt
index d3c0f177a..9bd62b58d 100644
--- a/java/org/apache/el/parser/ELParser.jjt
+++ b/java/org/apache/el/parser/ELParser.jjt
@@ -383,9 +383,9 @@ void Null() #Null : {}
     >
 |    < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
 |    < STRING_LITERAL: ("\"" ((~["\"","\\"])
-        | ("\\" ( ["\\","\""] )))* "\"")
+        | ("\\" ( ["\\","\"","\'"] )))* "\"")
         | ("\'" ((~["\'","\\"])
-        | ("\\" ( ["\\","\'"] )))* "\'")
+        | ("\\" ( ["\\","\"","\'"] )))* "\'")
     >
 |    < BADLY_ESCAPED_STRING_LITERAL: ("\"" (~["\"","\\"])* ("\\" ( ~["\\","\""] )))
         | ("\'" (~["\'","\\"])* ("\\" ( ~["\\","\'"] )))