Author: markt
Date: Sun Apr 11 18:15:02 2010
New Revision: 932967
URL: http://svn.apache.org/viewvc?rev=932967&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49081
"#${1+1}" should evaluate to "#2"
Note that all files apart from ELParser.jjt are generated by javacc from the
changes to ELParser.jjt
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java
tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java
tomcat/trunk/java/org/apache/el/parser/ParseException.java
tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java
tomcat/trunk/java/org/apache/el/parser/Token.java
tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java
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=932967&r1=932966&r2=932967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Sun Apr 11 18:15:02 2010
@@ -368,7 +368,7 @@ void Null() #Null : {}
*/
< LITERAL_EXPRESSION:
( (~["$", "#", "\\"])* "\\" (["$", "#"])?
- | (~["$", "#"])* (["$", "#"] ~["{"])
+ | (~["$", "#"])* (["$", "#"] ~["{", "$", "#"])
| (~["$", "#"])+
)+
| "$"
Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=932967&r1=932966&r2=932967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Sun Apr 11
18:15:02 2010
@@ -128,6 +128,8 @@ private int jjMoveNfa_0(int startState,
jjCheckNAdd(5);
break;
case 5:
+ if ((0xffffffe7ffffffffL & l) == 0L)
+ break;
if (kind > 1)
kind = 1;
jjCheckNAddStates(5, 8);
Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java?rev=932967&r1=932966&r2=932967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTreeConstants.java Sun Apr
11 18:15:02 2010
@@ -76,4 +76,4 @@ public interface ELParserTreeConstants
"Null",
};
}
-/* JavaCC - OriginalChecksum=57a11486271882e4bdcb1543fa567329 (do not edit
this line) */
+/* JavaCC - OriginalChecksum=437008e736f149e8fa6712fb36d831a1 (do not edit
this line) */
Modified: tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java?rev=932967&r1=932966&r2=932967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/JJTELParserState.java Sun Apr 11
18:15:02 2010
@@ -120,4 +120,4 @@ public class JJTELParserState {
}
}
}
-/* JavaCC - OriginalChecksum=9ea5296a2e1d85c8100fe40283f86cfd (do not edit
this line) */
+/* JavaCC - OriginalChecksum=70ac39f1e0e1eed7476e1dae2dfa25fa (do not edit
this line) */
Modified: tomcat/trunk/java/org/apache/el/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ParseException.java?rev=932967&r1=932966&r2=932967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ParseException.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ParseException.java Sun Apr 11
18:15:02 2010
@@ -184,4 +184,4 @@ public class ParseException extends Exce
}
}
-/* JavaCC - OriginalChecksum=275dbff1ac8d899b542b475adbf177f7 (do not edit
this line) */
+/* JavaCC - OriginalChecksum=87586a39aa89f164889cc59bc6a7e7ad (do not edit
this line) */
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java?rev=932967&r1=932966&r2=932967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java Sun Apr 11
18:15:02 2010
@@ -468,4 +468,4 @@ public class SimpleCharStream
}
}
-/* JavaCC - OriginalChecksum=56f6dd1368327bd2c0d7eeacba8a18de (do not edit
this line) */
+/* JavaCC - OriginalChecksum=9ba0db3918bffb8019f00da1e421f339 (do not edit
this line) */
Modified: tomcat/trunk/java/org/apache/el/parser/Token.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/Token.java?rev=932967&r1=932966&r2=932967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/Token.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/Token.java Sun Apr 11 18:15:02 2010
@@ -128,4 +128,4 @@ public class Token implements java.io.Se
}
}
-/* JavaCC - OriginalChecksum=30123d1b46e789463a75610c8e254dce (do not edit
this line) */
+/* JavaCC - OriginalChecksum=3fc97649fffa8b13e1e03af022020b2f (do not edit
this line) */
Modified: tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java?rev=932967&r1=932966&r2=932967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java Sun Apr 11
18:15:02 2010
@@ -144,4 +144,4 @@ public class TokenMgrError extends Error
this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter,
curChar), reason);
}
}
-/* JavaCC - OriginalChecksum=a2ee073c8f4075f3b262dddea050e5ea (do not edit
this line) */
+/* JavaCC - OriginalChecksum=de3ff0bacfb0fe749cc8eaf56ae82fea (do not edit
this line) */
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
