geirm 2003/12/30 04:18:52
Modified: src/java/org/apache/velocity/runtime/parser Parser.java
Parser.jj ParserTokenManager.java
Log:
Parser.jjt followers
Revision Changes Path
1.81 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
1.77 +3 -3
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj
Index: Parser.jj
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/Parser.jj,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Parser.jj 30 Dec 2003 11:47:58 -0000 1.76
+++ Parser.jj 30 Dec 2003 12:18:52 -0000 1.77
@@ -797,7 +797,7 @@
// <STRING_LITERAL: ( "\"" ( ~["\"","\n","\r"] )* "\"" ) | ( "'" (
~["'","\n","\r"] )* "'" ) >
< STRING_LITERAL:
("\""
- ( (~["\"","\\","\n","\r"])
+ ( (~["\"","\\"])
| ("\\"
( ["n","t","b","r","f","\\","'","\""]
| ["0"-"7"] ( ["0"-"7"] )?
@@ -810,7 +810,7 @@
)
|
("\'"
- ( (~["\'","\n","\r"])
+ ( (~["\'"])
| ( "\\" (" ")* "\n")
)*
"\'"
1.58 +4 -4
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
Index: ParserTokenManager.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ParserTokenManager.java 30 Dec 2003 11:47:58 -0000 1.57
+++ ParserTokenManager.java 30 Dec 2003 12:18:52 -0000 1.58
@@ -526,7 +526,7 @@
jjCheckNAddStates(3, 5);
break;
case 11:
- if ((0xfffffffbffffdbffL & l) != 0L)
+ if ((0xfffffffbffffffffL & l) != 0L)
jjCheckNAddStates(3, 5);
break;
case 12:
@@ -566,7 +566,7 @@
jjCheckNAddStates(0, 2);
break;
case 22:
- if ((0xffffff7fffffdbffL & l) != 0L)
+ if ((0xffffff7fffffffffL & l) != 0L)
jjCheckNAddStates(0, 2);
break;
case 24:
@@ -2861,7 +2861,7 @@
jjCheckNAddStates(69, 71);
break;
case 6:
- if ((0xfffffffbffffdbffL & l) != 0L)
+ if ((0xfffffffbffffffffL & l) != 0L)
jjCheckNAddStates(69, 71);
break;
case 7:
@@ -2901,7 +2901,7 @@
jjCheckNAddStates(66, 68);
break;
case 17:
- if ((0xffffff7fffffdbffL & l) != 0L)
+ if ((0xffffff7fffffffffL & l) != 0L)
jjCheckNAddStates(66, 68);
break;
case 19:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
