geirm 2003/12/23 05:29:29
Modified: src/java/org/apache/velocity/runtime/parser Parser.java
ParserTokenManager.java Parser.jj
Log:
parser.jjt followers
Revision Changes Path
1.79 +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.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
1.56 +9 -9
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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ParserTokenManager.java 29 Oct 2003 11:19:15 -0000 1.55
+++ ParserTokenManager.java 23 Dec 2003 13:29:29 -0000 1.56
@@ -454,12 +454,7 @@
kind = 52;
jjCheckNAdd(31);
}
- else if ((0x2400L & l) != 0L)
- {
- if (kind > 30)
- kind = 30;
- }
- else if ((0x100000200L & l) != 0L)
+ else if ((0x100002600L & l) != 0L)
{
if (kind > 26)
kind = 26;
@@ -485,6 +480,11 @@
kind = 9;
jjCheckNAddStates(6, 8);
}
+ if ((0x2400L & l) != 0L)
+ {
+ if (kind > 30)
+ kind = 30;
+ }
if (curChar == 13)
jjstateSet[jjnewStateCnt++] = 28;
break;
@@ -521,7 +521,7 @@
jjstateSet[jjnewStateCnt++] = 7;
break;
case 9:
- if ((0x100000200L & l) == 0L)
+ if ((0x100002600L & l) == 0L)
break;
if (kind > 26)
kind = 26;
@@ -2690,7 +2690,7 @@
kind = 52;
jjCheckNAdd(23);
}
- else if ((0x100000200L & l) != 0L)
+ else if ((0x100002600L & l) != 0L)
{
if (kind > 26)
kind = 26;
@@ -2726,7 +2726,7 @@
jjstateSet[jjnewStateCnt++] = 0;
break;
case 4:
- if ((0x100000200L & l) == 0L)
+ if ((0x100002600L & l) == 0L)
break;
if (kind > 26)
kind = 26;
1.75 +2 -2
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.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Parser.jj 29 Oct 2003 11:19:15 -0000 1.74
+++ Parser.jj 23 Dec 2003 13:29:29 -0000 1.75
@@ -788,7 +788,7 @@
<DIRECTIVE,REFMOD2>
TOKEN:
{
- <WHITESPACE : ([" ","\t"])+ >
+ <WHITESPACE : ([" ","\t", "\n", "\r"])+ >
}
<DIRECTIVE,REFMOD2>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
