Author: markt
Date: Sun Jul 21 09:34:52 2013
New Revision: 1505326
URL: http://svn.apache.org/r1505326
Log:
Review differences between Tomcat's grammar and spec's grammer.
Fix a comment typo
Correct entry for SKIP
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParser.java
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=1505326&r1=1505325&r2=1505326&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Sun Jul 21 09:34:52
2013
@@ -1945,7 +1945,7 @@ public class ELParser/*@bgen(jjtree)*/im
}
/*
- * FloatinPoint
+ * FloatingPoint
* For Decimal and Floating Point Literals
*/
final public void FloatingPoint() throws ParseException {
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=1505326&r1=1505325&r2=1505326&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Sun Jul 21 09:34:52 2013
@@ -423,7 +423,7 @@ void Boolean() : {}
}
/*
- * FloatinPoint
+ * FloatingPoint
* For Decimal and Floating Point Literals
*/
void FloatingPoint() #FloatingPoint : { Token t = null; }
@@ -485,7 +485,7 @@ java.util.Deque<Integer> deque = new jav
< START_DEFERRED_EXPRESSION: "#{" > {deque.push(DEFAULT);}: IN_EXPRESSION
}
-<IN_EXPRESSION> SKIP : { " " | "\t" | "\n" | "\r" }
+<IN_EXPRESSION, IN_SET_OR_MAP> SKIP : { " " | "\t" | "\n" | "\r" }
<IN_EXPRESSION, IN_SET_OR_MAP> TOKEN :
{
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=1505326&r1=1505325&r2=1505326&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Sun Jul 21
09:34:52 2013
@@ -2022,6 +2022,11 @@ public Token getNextToken()
}
break;
case 2:
+ try { input_stream.backup(0);
+ while (curChar <= 32 && (0x100002600L & (1L << curChar)) != 0L)
+ curChar = input_stream.BeginToken();
+ }
+ catch (java.io.IOException e1) { continue EOFLoop; }
jjmatchedKind = 0x7fffffff;
jjmatchedPos = 0;
curPos = jjMoveStringLiteralDfa0_2();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
