geirm 2003/12/30 12:10:22
Modified: src/java/org/apache/velocity/runtime/parser Parser.java
Parser.jj ParserConstants.java
ParserTokenManager.java
Log:
parser auto kruft
Revision Changes Path
1.82 +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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
1.78 +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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- Parser.jj 30 Dec 2003 12:18:52 -0000 1.77
+++ Parser.jj 30 Dec 2003 20:10:22 -0000 1.78
@@ -871,7 +871,7 @@
| <LOGICAL_GE: ">=" | "ge" >
| <LOGICAL_EQUALS: "==" | "eq" >
| <LOGICAL_NOT_EQUALS: "!=" | "ne" >
-| <LOGICAL_NOT: "!">
+| <LOGICAL_NOT: "!" | "not" >
| <EQUALS: "=" >
}
1.24 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserConstants.java
Index: ParserConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/ParserConstants.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ParserConstants.java 30 Dec 2003 11:47:58 -0000 1.23
+++ ParserConstants.java 30 Dec 2003 20:10:22 -0000 1.24
@@ -120,7 +120,7 @@
"<LOGICAL_GE>",
"<LOGICAL_EQUALS>",
"<LOGICAL_NOT_EQUALS>",
- "\"!\"",
+ "<LOGICAL_NOT>",
"\"=\"",
"<END>",
"\"if\"",
1.59 +138 -125
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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ParserTokenManager.java 30 Dec 2003 12:18:52 -0000 1.58
+++ ParserTokenManager.java 30 Dec 2003 20:10:22 -0000 1.59
@@ -165,26 +165,24 @@
switch (pos)
{
case 0:
+ if ((active0 & 0x80000000L) != 0L)
+ return 53;
if ((active0 & 0x200000000000L) != 0L)
return 45;
+ if ((active0 & 0x68000L) != 0L)
+ return 7;
if ((active0 & 0x30000000L) != 0L)
{
jjmatchedKind = 55;
- return 56;
+ return 55;
}
- if ((active0 & 0x100000000000L) != 0L)
- return 49;
- if ((active0 & 0x80000000L) != 0L)
- return 54;
- if ((active0 & 0x68000L) != 0L)
- return 7;
return -1;
case 1:
if ((active0 & 0x30000000L) != 0L)
{
jjmatchedKind = 55;
jjmatchedPos = 1;
- return 56;
+ return 55;
}
if ((active0 & 0x20000L) != 0L)
return 5;
@@ -194,18 +192,18 @@
{
jjmatchedKind = 55;
jjmatchedPos = 2;
- return 56;
+ return 55;
}
return -1;
case 3:
+ if ((active0 & 0x10000000L) != 0L)
+ return 55;
if ((active0 & 0x20000000L) != 0L)
{
jjmatchedKind = 55;
jjmatchedPos = 3;
- return 56;
+ return 55;
}
- if ((active0 & 0x10000000L) != 0L)
- return 56;
return -1;
default :
return -1;
@@ -233,8 +231,6 @@
{
switch(curChar)
{
- case 33:
- return jjStartNfaWithStates_0(0, 44, 49);
case 35:
jjmatchedKind = 18;
return jjMoveStringLiteralDfa1_0(0x28000L);
@@ -249,7 +245,7 @@
case 44:
return jjStopAtPos(0, 3);
case 45:
- return jjStartNfaWithStates_0(0, 31, 54);
+ return jjStartNfaWithStates_0(0, 31, 53);
case 46:
return jjMoveStringLiteralDfa1_0(0x10L);
case 47:
@@ -337,7 +333,7 @@
{
case 101:
if ((active0 & 0x10000000L) != 0L)
- return jjStartNfaWithStates_0(3, 28, 56);
+ return jjStartNfaWithStates_0(3, 28, 55);
break;
case 115:
return jjMoveStringLiteralDfa4_0(active0, 0x20000000L);
@@ -359,7 +355,7 @@
{
case 101:
if ((active0 & 0x20000000L) != 0L)
- return jjStartNfaWithStates_0(4, 29, 56);
+ return jjStartNfaWithStates_0(4, 29, 55);
break;
default :
break;
@@ -406,7 +402,7 @@
{
int[] nextStates;
int startsAt = 0;
- jjnewStateCnt = 71;
+ jjnewStateCnt = 74;
int i = 1;
jjstateSet[0] = startState;
int j, kind = 0x7fffffff;
@@ -426,7 +422,7 @@
{
if (kind > 52)
kind = 52;
- jjCheckNAdd(54);
+ jjCheckNAdd(53);
}
else if ((0x100002600L & l) != 0L)
{
@@ -438,12 +434,15 @@
{
if (kind > 13)
kind = 13;
- jjCheckNAddTwoStates(62, 63);
+ jjCheckNAddTwoStates(61, 62);
}
else if (curChar == 45)
- jjCheckNAdd(54);
+ jjCheckNAdd(53);
else if (curChar == 33)
- jjstateSet[jjnewStateCnt++] = 49;
+ {
+ if (kind > 44)
+ kind = 44;
+ }
else if (curChar == 61)
jjstateSet[jjnewStateCnt++] = 45;
else if (curChar == 62)
@@ -469,6 +468,8 @@
if (kind > 30)
kind = 30;
}
+ else if (curChar == 33)
+ jjstateSet[jjnewStateCnt++] = 49;
else if (curChar == 62)
{
if (kind > 40)
@@ -641,42 +642,46 @@
if (curChar == 33)
jjstateSet[jjnewStateCnt++] = 49;
break;
- case 53:
+ case 51:
+ if (curChar == 33 && kind > 44)
+ kind = 44;
+ break;
+ case 52:
if (curChar == 45)
- jjCheckNAdd(54);
+ jjCheckNAdd(53);
break;
- case 54:
+ case 53:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 52)
kind = 52;
- jjCheckNAdd(54);
+ jjCheckNAdd(53);
break;
- case 56:
+ case 55:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 55)
kind = 55;
- jjstateSet[jjnewStateCnt++] = 56;
+ jjstateSet[jjnewStateCnt++] = 55;
break;
- case 59:
+ case 58:
if (curChar == 36 && kind > 13)
kind = 13;
break;
- case 61:
+ case 60:
if (curChar == 36)
- jjCheckNAddTwoStates(62, 63);
+ jjCheckNAddTwoStates(61, 62);
break;
- case 63:
+ case 62:
if (curChar == 33 && kind > 14)
kind = 14;
break;
- case 64:
+ case 63:
if (curChar != 36)
break;
if (kind > 13)
kind = 13;
- jjCheckNAddTwoStates(62, 63);
+ jjCheckNAddTwoStates(61, 62);
break;
default : break;
}
@@ -694,18 +699,18 @@
{
if (kind > 55)
kind = 55;
- jjCheckNAdd(56);
+ jjCheckNAdd(55);
}
else if (curChar == 92)
jjCheckNAddStates(17, 20);
else if (curChar == 124)
jjstateSet[jjnewStateCnt++] = 35;
- if (curChar == 103)
+ if (curChar == 110)
jjAddStates(21, 22);
- else if (curChar == 108)
+ else if (curChar == 103)
jjAddStates(23, 24);
- else if (curChar == 110)
- jjstateSet[jjnewStateCnt++] = 51;
+ else if (curChar == 108)
+ jjAddStates(25, 26);
else if (curChar == 101)
jjstateSet[jjnewStateCnt++] = 47;
else if (curChar == 111)
@@ -723,7 +728,7 @@
break;
case 13:
if (curChar == 92)
- jjAddStates(25, 29);
+ jjAddStates(27, 31);
break;
case 14:
if ((0x14404410000000L & l) != 0L)
@@ -772,62 +777,70 @@
if (curChar == 101)
jjstateSet[jjnewStateCnt++] = 47;
break;
- case 51:
- if (curChar == 101 && kind > 43)
- kind = 43;
- break;
- case 52:
- if (curChar == 110)
- jjstateSet[jjnewStateCnt++] = 51;
- break;
+ case 54:
case 55:
- case 56:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 55)
kind = 55;
- jjCheckNAdd(56);
+ jjCheckNAdd(55);
break;
- case 57:
+ case 56:
if (curChar == 92)
jjCheckNAddStates(17, 20);
break;
- case 58:
+ case 57:
if (curChar == 92)
- jjCheckNAddTwoStates(58, 59);
+ jjCheckNAddTwoStates(57, 58);
break;
- case 60:
+ case 59:
if (curChar == 92)
- jjCheckNAddTwoStates(60, 61);
+ jjCheckNAddTwoStates(59, 60);
break;
- case 62:
+ case 61:
if (curChar == 92)
- jjAddStates(30, 31);
+ jjAddStates(32, 33);
break;
- case 65:
+ case 64:
if (curChar == 108)
- jjAddStates(23, 24);
+ jjAddStates(25, 26);
break;
- case 66:
+ case 65:
if (curChar == 116 && kind > 38)
kind = 38;
break;
- case 67:
+ case 66:
if (curChar == 101 && kind > 39)
kind = 39;
break;
- case 68:
+ case 67:
if (curChar == 103)
- jjAddStates(21, 22);
+ jjAddStates(23, 24);
break;
- case 69:
+ case 68:
if (curChar == 116 && kind > 40)
kind = 40;
break;
- case 70:
+ case 69:
if (curChar == 101 && kind > 41)
kind = 41;
break;
+ case 70:
+ if (curChar == 110)
+ jjAddStates(21, 22);
+ break;
+ case 71:
+ if (curChar == 101 && kind > 43)
+ kind = 43;
+ break;
+ case 72:
+ if (curChar == 116 && kind > 44)
+ kind = 44;
+ break;
+ case 73:
+ if (curChar == 111)
+ jjstateSet[jjnewStateCnt++] = 72;
+ break;
default : break;
}
} while(i != startsAt);
@@ -866,7 +879,7 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 71 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 74 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -1006,7 +1019,7 @@
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(32, 35);
+ jjCheckNAddStates(34, 37);
break;
case 1:
if (kind > 16)
@@ -1022,7 +1035,7 @@
break;
case 9:
if (curChar == 92)
- jjAddStates(36, 37);
+ jjAddStates(38, 39);
break;
default : break;
}
@@ -1321,7 +1334,7 @@
kind = 49;
}
else if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(38, 40);
+ jjCheckNAddStates(40, 42);
if (curChar == 13)
jjstateSet[jjnewStateCnt++] = 26;
break;
@@ -1391,7 +1404,7 @@
break;
case 18:
if ((0x100000200L & l) != 0L)
- jjAddStates(41, 43);
+ jjAddStates(43, 45);
break;
case 19:
if ((0x2400L & l) != 0L && kind > 46)
@@ -1407,7 +1420,7 @@
break;
case 24:
if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(38, 40);
+ jjCheckNAddStates(40, 42);
break;
case 25:
if ((0x2400L & l) != 0L && kind > 49)
@@ -1440,9 +1453,9 @@
jjCheckNAdd(7);
}
else if (curChar == 92)
- jjCheckNAddStates(44, 47);
+ jjCheckNAddStates(46, 49);
if (curChar == 101)
- jjAddStates(48, 49);
+ jjAddStates(50, 51);
break;
case 30:
case 7:
@@ -1485,7 +1498,7 @@
{
if (kind > 49)
kind = 49;
- jjAddStates(38, 40);
+ jjAddStates(40, 42);
}
break;
case 1:
@@ -1501,7 +1514,7 @@
break;
case 8:
if (curChar == 92)
- jjCheckNAddStates(44, 47);
+ jjCheckNAddStates(46, 49);
break;
case 9:
if (curChar == 92)
@@ -1513,18 +1526,18 @@
break;
case 13:
if (curChar == 92)
- jjAddStates(50, 51);
+ jjAddStates(52, 53);
break;
case 16:
if (curChar == 101)
- jjAddStates(48, 49);
+ jjAddStates(50, 51);
break;
case 17:
if (curChar != 100)
break;
if (kind > 46)
kind = 46;
- jjAddStates(41, 43);
+ jjAddStates(43, 45);
break;
case 29:
if (curChar == 108)
@@ -1699,7 +1712,7 @@
break;
case 2:
if (curChar == 32)
- jjAddStates(52, 53);
+ jjAddStates(54, 55);
break;
case 3:
if (curChar == 40 && kind > 12)
@@ -1778,13 +1791,13 @@
jjCheckNAdd(7);
}
else if (curChar == 92)
- jjCheckNAddStates(54, 57);
+ jjCheckNAddStates(56, 59);
if (curChar == 92)
- jjAddStates(36, 37);
+ jjAddStates(38, 39);
break;
case 25:
if (curChar == 92)
- jjAddStates(36, 37);
+ jjAddStates(38, 39);
if (curChar == 92)
jjCheckNAddTwoStates(20, 21);
if (curChar == 92)
@@ -1800,7 +1813,7 @@
break;
case 1:
if (curChar == 116)
- jjAddStates(52, 53);
+ jjAddStates(54, 55);
break;
case 4:
if (curChar == 101)
@@ -1815,7 +1828,7 @@
break;
case 8:
if (curChar == 92)
- jjAddStates(36, 37);
+ jjAddStates(38, 39);
break;
case 11:
case 12:
@@ -1831,7 +1844,7 @@
break;
case 17:
if (curChar == 92)
- jjCheckNAddStates(54, 57);
+ jjCheckNAddStates(56, 59);
break;
case 18:
if (curChar == 92)
@@ -1843,7 +1856,7 @@
break;
case 22:
if (curChar == 92)
- jjAddStates(58, 59);
+ jjAddStates(60, 61);
break;
default : break;
}
@@ -2023,7 +2036,7 @@
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(32, 35);
+ jjCheckNAddStates(34, 37);
break;
case 1:
if (kind > 16)
@@ -2039,7 +2052,7 @@
break;
case 9:
if (curChar == 92)
- jjAddStates(36, 37);
+ jjAddStates(38, 39);
break;
default : break;
}
@@ -2226,7 +2239,7 @@
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(60, 63);
+ jjCheckNAddStates(62, 65);
break;
case 1:
if (kind > 16)
@@ -2242,7 +2255,7 @@
break;
case 12:
if (curChar == 92)
- jjAddStates(64, 65);
+ jjAddStates(66, 67);
break;
default : break;
}
@@ -2536,7 +2549,7 @@
jjCheckNAdd(5);
}
else if (curChar == 92)
- jjCheckNAddStates(44, 47);
+ jjCheckNAddStates(46, 49);
break;
case 1:
if (kind > 16)
@@ -2556,7 +2569,7 @@
break;
case 8:
if (curChar == 92)
- jjCheckNAddStates(44, 47);
+ jjCheckNAddStates(46, 49);
break;
case 9:
if (curChar == 92)
@@ -2568,7 +2581,7 @@
break;
case 13:
if (curChar == 92)
- jjAddStates(50, 51);
+ jjAddStates(52, 53);
break;
default : break;
}
@@ -2831,9 +2844,9 @@
else if (curChar == 45)
jjCheckNAdd(23);
else if (curChar == 39)
- jjCheckNAddStates(66, 68);
+ jjCheckNAddStates(68, 70);
else if (curChar == 34)
- jjCheckNAddStates(69, 71);
+ jjCheckNAddStates(71, 73);
else if (curChar == 35)
jjstateSet[jjnewStateCnt++] = 2;
break;
@@ -2858,11 +2871,11 @@
break;
case 5:
if (curChar == 34)
- jjCheckNAddStates(69, 71);
+ jjCheckNAddStates(71, 73);
break;
case 6:
if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddStates(69, 71);
+ jjCheckNAddStates(71, 73);
break;
case 7:
if (curChar == 34 && kind > 27)
@@ -2870,15 +2883,15 @@
break;
case 9:
if ((0x8400000000L & l) != 0L)
- jjCheckNAddStates(69, 71);
+ jjCheckNAddStates(71, 73);
break;
case 10:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(72, 75);
+ jjCheckNAddStates(74, 77);
break;
case 11:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(69, 71);
+ jjCheckNAddStates(71, 73);
break;
case 12:
if ((0xf000000000000L & l) != 0L)
@@ -2890,19 +2903,19 @@
break;
case 14:
if (curChar == 32)
- jjAddStates(76, 77);
+ jjAddStates(78, 79);
break;
case 15:
if (curChar == 10)
- jjCheckNAddStates(69, 71);
+ jjCheckNAddStates(71, 73);
break;
case 16:
if (curChar == 39)
- jjCheckNAddStates(66, 68);
+ jjCheckNAddStates(68, 70);
break;
case 17:
if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddStates(66, 68);
+ jjCheckNAddStates(68, 70);
break;
case 19:
if (curChar == 32)
@@ -2910,7 +2923,7 @@
break;
case 20:
if (curChar == 10)
- jjCheckNAddStates(66, 68);
+ jjCheckNAddStates(68, 70);
break;
case 21:
if (curChar == 39 && kind > 27)
@@ -2976,7 +2989,7 @@
jjCheckNAdd(25);
}
else if (curChar == 92)
- jjCheckNAddStates(78, 81);
+ jjCheckNAddStates(80, 83);
break;
case 1:
if (kind > 16)
@@ -2984,18 +2997,18 @@
break;
case 6:
if ((0xffffffffefffffffL & l) != 0L)
- jjCheckNAddStates(69, 71);
+ jjCheckNAddStates(71, 73);
break;
case 8:
if (curChar == 92)
- jjAddStates(82, 86);
+ jjAddStates(84, 88);
break;
case 9:
if ((0x14404410000000L & l) != 0L)
- jjCheckNAddStates(69, 71);
+ jjCheckNAddStates(71, 73);
break;
case 17:
- jjAddStates(66, 68);
+ jjAddStates(68, 70);
break;
case 18:
if (curChar == 92)
@@ -3015,7 +3028,7 @@
break;
case 28:
if (curChar == 92)
- jjCheckNAddStates(78, 81);
+ jjCheckNAddStates(80, 83);
break;
case 29:
if (curChar == 92)
@@ -3027,7 +3040,7 @@
break;
case 33:
if (curChar == 92)
- jjAddStates(87, 88);
+ jjAddStates(89, 90);
break;
default : break;
}
@@ -3050,11 +3063,11 @@
break;
case 6:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(69, 71);
+ jjAddStates(71, 73);
break;
case 17:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(66, 68);
+ jjAddStates(68, 70);
break;
default : break;
}
@@ -3331,7 +3344,7 @@
jjCheckNAdd(5);
}
else if (curChar == 92)
- jjCheckNAddStates(44, 47);
+ jjCheckNAddStates(46, 49);
break;
case 1:
if (kind > 16)
@@ -3351,7 +3364,7 @@
break;
case 8:
if (curChar == 92)
- jjCheckNAddStates(44, 47);
+ jjCheckNAddStates(46, 49);
break;
case 9:
if (curChar == 92)
@@ -3363,7 +3376,7 @@
break;
case 13:
if (curChar == 92)
- jjAddStates(50, 51);
+ jjAddStates(52, 53);
break;
default : break;
}
@@ -3403,11 +3416,11 @@
}
static final int[] jjnextStates = {
22, 23, 26, 11, 12, 13, 1, 2, 4, 11, 16, 12, 13, 19, 20, 24,
- 25, 58, 59, 60, 61, 69, 70, 66, 67, 14, 15, 17, 19, 20, 62, 63,
- 5, 6, 7, 8, 9, 10, 24, 25, 27, 18, 19, 21, 9, 10, 11, 12,
- 22, 29, 13, 14, 2, 3, 18, 19, 20, 21, 22, 23, 8, 9, 10, 11,
- 12, 13, 17, 18, 21, 6, 7, 8, 6, 11, 7, 8, 14, 15, 29, 30,
- 31, 32, 9, 10, 12, 14, 15, 33, 34,
+ 25, 57, 58, 59, 60, 71, 73, 68, 69, 65, 66, 14, 15, 17, 19, 20,
+ 61, 62, 5, 6, 7, 8, 9, 10, 24, 25, 27, 18, 19, 21, 9, 10,
+ 11, 12, 22, 29, 13, 14, 2, 3, 18, 19, 20, 21, 22, 23, 8, 9,
+ 10, 11, 12, 13, 17, 18, 21, 6, 7, 8, 6, 11, 7, 8, 14, 15,
+ 29, 30, 31, 32, 9, 10, 12, 14, 15, 33, 34,
};
private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long
l2)
{
@@ -3456,8 +3469,8 @@
0x7e000L, 0x0L,
};
private CharStream input_stream;
-private final int[] jjrounds = new int[71];
-private final int[] jjstateSet = new int[142];
+private final int[] jjrounds = new int[74];
+private final int[] jjstateSet = new int[148];
StringBuffer image;
int jjimageLen;
int lengthOfMatch;
@@ -3482,7 +3495,7 @@
{
int i;
jjround = 0x80000001;
- for (i = 71; i-- > 0;)
+ for (i = 74; i-- > 0;)
jjrounds[i] = 0x80000000;
}
public void ReInit(CharStream stream, int lexState)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
