You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2010/03/28 20:29:34 UTC
svn commit: r928469 [2/3] - in /velocity/engine/branches/2.0_Exp/src:
java/org/apache/velocity/runtime/parser/
java/org/apache/velocity/runtime/parser/node/ parser/
test/org/apache/velocity/test/issues/
Modified: velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?rev=928469&r1=928468&r2=928469&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java (original)
+++ velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java Sun Mar 28 18:29:33 2010
@@ -180,48 +180,48 @@ private final int jjStopStringLiteralDfa
switch (pos)
{
case 0:
- if ((active0 & 0x40L) != 0L)
- return 58;
if ((active0 & 0x1000000000L) != 0L)
- return 101;
+ return 105;
if ((active0 & 0x100L) != 0L)
- return 65;
+ return 69;
if ((active0 & 0x600000000L) != 0L)
{
jjmatchedKind = 61;
- return 63;
+ return 67;
}
+ if ((active0 & 0x40L) != 0L)
+ return 62;
if ((active0 & 0x4000000000000L) != 0L)
- return 50;
+ return 54;
if ((active0 & 0x3a0000L) != 0L)
return 7;
return -1;
case 1:
- if ((active0 & 0x80000L) != 0L)
- return 5;
if ((active0 & 0x600000000L) != 0L)
{
jjmatchedKind = 61;
jjmatchedPos = 1;
- return 63;
+ return 67;
}
+ if ((active0 & 0x80000L) != 0L)
+ return 5;
return -1;
case 2:
if ((active0 & 0x600000000L) != 0L)
{
jjmatchedKind = 61;
jjmatchedPos = 2;
- return 63;
+ return 67;
}
return -1;
case 3:
if ((active0 & 0x200000000L) != 0L)
- return 63;
+ return 67;
if ((active0 & 0x400000000L) != 0L)
{
jjmatchedKind = 61;
jjmatchedPos = 3;
- return 63;
+ return 67;
}
return -1;
default :
@@ -256,7 +256,7 @@ private int jjMoveStringLiteralDfa0_3()
case 44:
return jjStopAtPos(0, 5);
case 45:
- return jjStartNfaWithStates_3(0, 36, 101);
+ return jjStartNfaWithStates_3(0, 36, 105);
case 46:
return jjMoveStringLiteralDfa1_3(0x40L);
case 47:
@@ -264,7 +264,7 @@ private int jjMoveStringLiteralDfa0_3()
case 58:
return jjStopAtPos(0, 7);
case 61:
- return jjStartNfaWithStates_3(0, 50, 50);
+ return jjStartNfaWithStates_3(0, 50, 54);
case 91:
return jjStopAtPos(0, 3);
case 93:
@@ -274,7 +274,7 @@ private int jjMoveStringLiteralDfa0_3()
case 116:
return jjMoveStringLiteralDfa1_3(0x200000000L);
case 123:
- return jjStartNfaWithStates_3(0, 8, 65);
+ return jjStartNfaWithStates_3(0, 8, 69);
case 125:
return jjStopAtPos(0, 9);
default :
@@ -350,7 +350,7 @@ private int jjMoveStringLiteralDfa3_3(lo
{
case 101:
if ((active0 & 0x200000000L) != 0L)
- return jjStartNfaWithStates_3(3, 33, 63);
+ return jjStartNfaWithStates_3(3, 33, 67);
break;
case 115:
return jjMoveStringLiteralDfa4_3(active0, 0x400000000L);
@@ -372,7 +372,7 @@ private int jjMoveStringLiteralDfa4_3(lo
{
case 101:
if ((active0 & 0x400000000L) != 0L)
- return jjStartNfaWithStates_3(4, 34, 63);
+ return jjStartNfaWithStates_3(4, 34, 67);
break;
default :
break;
@@ -396,7 +396,7 @@ static final long[] jjbitVec2 = {
private int jjMoveNfa_3(int startState, int curPos)
{
int startsAt = 0;
- jjnewStateCnt = 101;
+ jjnewStateCnt = 105;
int i = 1;
jjstateSet[0] = startState;
int kind = 0x7fffffff;
@@ -411,6 +411,20 @@ private int jjMoveNfa_3(int startState,
{
switch(jjstateSet[--i])
{
+ case 105:
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddTwoStates(100, 101);
+ else if (curChar == 46)
+ jjCheckNAdd(62);
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddTwoStates(94, 95);
+ if ((0x3ff000000000000L & l) != 0L)
+ {
+ if (kind > 56)
+ kind = 56;
+ jjCheckNAddTwoStates(91, 93);
+ }
+ break;
case 0:
if ((0x3ff000000000000L & l) != 0L)
{
@@ -430,34 +444,34 @@ private int jjMoveNfa_3(int startState,
{
if (kind > 15)
kind = 15;
- jjCheckNAddTwoStates(73, 74);
+ jjCheckNAddTwoStates(77, 78);
}
else if (curChar == 46)
- jjCheckNAdd(58);
+ jjCheckNAdd(62);
else if (curChar == 33)
{
if (kind > 49)
kind = 49;
}
else if (curChar == 61)
- jjstateSet[jjnewStateCnt++] = 50;
+ jjstateSet[jjnewStateCnt++] = 54;
else if (curChar == 62)
- jjstateSet[jjnewStateCnt++] = 48;
+ jjstateSet[jjnewStateCnt++] = 52;
else if (curChar == 60)
- jjstateSet[jjnewStateCnt++] = 45;
+ jjstateSet[jjnewStateCnt++] = 49;
else if (curChar == 38)
- jjstateSet[jjnewStateCnt++] = 35;
+ jjstateSet[jjnewStateCnt++] = 39;
else if (curChar == 39)
- jjCheckNAddStates(10, 12);
+ jjCheckNAddStates(10, 13);
else if (curChar == 34)
- jjCheckNAddStates(13, 15);
+ jjCheckNAddStates(14, 17);
else if (curChar == 35)
jjstateSet[jjnewStateCnt++] = 7;
else if (curChar == 41)
{
if (kind > 11)
kind = 11;
- jjCheckNAddStates(16, 18);
+ jjCheckNAddStates(18, 20);
}
if ((0x2400L & l) != 0L)
{
@@ -465,7 +479,7 @@ private int jjMoveNfa_3(int startState,
kind = 35;
}
else if (curChar == 33)
- jjstateSet[jjnewStateCnt++] = 54;
+ jjstateSet[jjnewStateCnt++] = 58;
else if (curChar == 62)
{
if (kind > 45)
@@ -477,25 +491,11 @@ private int jjMoveNfa_3(int startState,
kind = 43;
}
if (curChar == 13)
- jjstateSet[jjnewStateCnt++] = 33;
- break;
- case 101:
- if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(96, 97);
- else if (curChar == 46)
- jjCheckNAdd(58);
- if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(90, 91);
- if ((0x3ff000000000000L & l) != 0L)
- {
- if (kind > 56)
- kind = 56;
- jjCheckNAddTwoStates(87, 89);
- }
+ jjstateSet[jjnewStateCnt++] = 37;
break;
case 1:
if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(16, 18);
+ jjCheckNAddStates(18, 20);
break;
case 2:
if ((0x2400L & l) != 0L && kind > 11)
@@ -533,44 +533,37 @@ private int jjMoveNfa_3(int startState,
jjCheckNAdd(9);
break;
case 10:
+ case 12:
if (curChar == 34)
- jjCheckNAddStates(13, 15);
+ jjCheckNAddStates(14, 17);
break;
case 11:
if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddStates(13, 15);
+ jjCheckNAddStates(14, 17);
break;
- case 12:
- if (curChar == 34 && kind > 32)
- kind = 32;
+ case 13:
+ if (curChar == 34)
+ jjstateSet[jjnewStateCnt++] = 12;
break;
case 14:
- if ((0x8400000000L & l) != 0L)
- jjCheckNAddStates(13, 15);
+ if (curChar == 34 && kind > 32)
+ kind = 32;
break;
- case 15:
+ case 17:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(19, 22);
+ jjCheckNAddStates(21, 25);
break;
- case 16:
+ case 18:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(13, 15);
+ jjCheckNAddStates(14, 17);
break;
- case 17:
+ case 19:
if ((0xf000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 18;
- break;
- case 18:
- if ((0xff000000000000L & l) != 0L)
- jjCheckNAdd(16);
+ jjstateSet[jjnewStateCnt++] = 20;
break;
case 20:
- if ((0x3ff000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 21;
- break;
- case 21:
- if ((0x3ff000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 22;
+ if ((0xff000000000000L & l) != 0L)
+ jjCheckNAdd(18);
break;
case 22:
if ((0x3ff000000000000L & l) != 0L)
@@ -578,216 +571,229 @@ private int jjMoveNfa_3(int startState,
break;
case 23:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(13, 15);
+ jjstateSet[jjnewStateCnt++] = 24;
break;
case 24:
- if (curChar == 32)
- jjAddStates(23, 24);
+ if ((0x3ff000000000000L & l) != 0L)
+ jjstateSet[jjnewStateCnt++] = 25;
break;
case 25:
- if (curChar == 10)
- jjCheckNAddStates(13, 15);
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddStates(14, 17);
break;
case 26:
- if (curChar == 39)
- jjCheckNAddStates(10, 12);
+ if (curChar == 32)
+ jjAddStates(26, 27);
break;
case 27:
- if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddStates(10, 12);
+ if (curChar == 10)
+ jjCheckNAddStates(14, 17);
+ break;
+ case 28:
+ case 30:
+ if (curChar == 39)
+ jjCheckNAddStates(10, 13);
break;
case 29:
+ if ((0xffffff7fffffffffL & l) != 0L)
+ jjCheckNAddStates(10, 13);
+ break;
+ case 31:
+ if (curChar == 39)
+ jjstateSet[jjnewStateCnt++] = 30;
+ break;
+ case 33:
if (curChar == 32)
- jjAddStates(25, 26);
+ jjAddStates(28, 29);
break;
- case 30:
+ case 34:
if (curChar == 10)
- jjCheckNAddStates(10, 12);
+ jjCheckNAddStates(10, 13);
break;
- case 31:
+ case 35:
if (curChar == 39 && kind > 32)
kind = 32;
break;
- case 32:
+ case 36:
if ((0x2400L & l) != 0L && kind > 35)
kind = 35;
break;
- case 33:
+ case 37:
if (curChar == 10 && kind > 35)
kind = 35;
break;
- case 34:
+ case 38:
if (curChar == 13)
- jjstateSet[jjnewStateCnt++] = 33;
+ jjstateSet[jjnewStateCnt++] = 37;
break;
- case 35:
+ case 39:
if (curChar == 38 && kind > 41)
kind = 41;
break;
- case 36:
+ case 40:
if (curChar == 38)
- jjstateSet[jjnewStateCnt++] = 35;
+ jjstateSet[jjnewStateCnt++] = 39;
break;
- case 44:
+ case 48:
if (curChar == 60 && kind > 43)
kind = 43;
break;
- case 45:
+ case 49:
if (curChar == 61 && kind > 44)
kind = 44;
break;
- case 46:
+ case 50:
if (curChar == 60)
- jjstateSet[jjnewStateCnt++] = 45;
+ jjstateSet[jjnewStateCnt++] = 49;
break;
- case 47:
+ case 51:
if (curChar == 62 && kind > 45)
kind = 45;
break;
- case 48:
+ case 52:
if (curChar == 61 && kind > 46)
kind = 46;
break;
- case 49:
+ case 53:
if (curChar == 62)
- jjstateSet[jjnewStateCnt++] = 48;
+ jjstateSet[jjnewStateCnt++] = 52;
break;
- case 50:
+ case 54:
if (curChar == 61 && kind > 47)
kind = 47;
break;
- case 51:
+ case 55:
if (curChar == 61)
- jjstateSet[jjnewStateCnt++] = 50;
+ jjstateSet[jjnewStateCnt++] = 54;
break;
- case 54:
+ case 58:
if (curChar == 61 && kind > 48)
kind = 48;
break;
- case 55:
+ case 59:
if (curChar == 33)
- jjstateSet[jjnewStateCnt++] = 54;
+ jjstateSet[jjnewStateCnt++] = 58;
break;
- case 56:
+ case 60:
if (curChar == 33 && kind > 49)
kind = 49;
break;
- case 57:
+ case 61:
if (curChar == 46)
- jjCheckNAdd(58);
+ jjCheckNAdd(62);
break;
- case 58:
+ case 62:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAddTwoStates(58, 59);
+ jjCheckNAddTwoStates(62, 63);
break;
- case 60:
+ case 64:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(61);
+ jjCheckNAdd(65);
break;
- case 61:
+ case 65:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(61);
+ jjCheckNAdd(65);
break;
- case 63:
+ case 67:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 61)
kind = 61;
- jjstateSet[jjnewStateCnt++] = 63;
+ jjstateSet[jjnewStateCnt++] = 67;
break;
- case 66:
+ case 70:
if ((0x3ff000000000000L & l) != 0L)
- jjAddStates(27, 28);
+ jjAddStates(30, 31);
break;
- case 70:
+ case 74:
if (curChar == 36 && kind > 15)
kind = 15;
break;
- case 72:
+ case 76:
if (curChar == 36)
- jjCheckNAddTwoStates(73, 74);
+ jjCheckNAddTwoStates(77, 78);
break;
- case 74:
+ case 78:
if (curChar == 33 && kind > 16)
kind = 16;
break;
- case 75:
+ case 79:
if (curChar != 36)
break;
if (kind > 15)
kind = 15;
- jjCheckNAddTwoStates(73, 74);
+ jjCheckNAddTwoStates(77, 78);
break;
- case 86:
+ case 90:
if (curChar == 45)
jjCheckNAddStates(6, 9);
break;
- case 87:
+ case 91:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 56)
kind = 56;
- jjCheckNAddTwoStates(87, 89);
+ jjCheckNAddTwoStates(91, 93);
break;
- case 88:
+ case 92:
if (curChar == 46 && kind > 56)
kind = 56;
break;
- case 89:
+ case 93:
if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 88;
+ jjstateSet[jjnewStateCnt++] = 92;
break;
- case 90:
+ case 94:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(90, 91);
+ jjCheckNAddTwoStates(94, 95);
break;
- case 91:
+ case 95:
if (curChar != 46)
break;
if (kind > 57)
kind = 57;
- jjCheckNAddTwoStates(92, 93);
+ jjCheckNAddTwoStates(96, 97);
break;
- case 92:
+ case 96:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAddTwoStates(92, 93);
+ jjCheckNAddTwoStates(96, 97);
break;
- case 94:
+ case 98:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(95);
+ jjCheckNAdd(99);
break;
- case 95:
+ case 99:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(95);
+ jjCheckNAdd(99);
break;
- case 96:
+ case 100:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(96, 97);
+ jjCheckNAddTwoStates(100, 101);
break;
- case 98:
+ case 102:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(99);
+ jjCheckNAdd(103);
break;
- case 99:
+ case 103:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(99);
+ jjCheckNAdd(103);
break;
- case 100:
+ case 104:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 56)
@@ -810,52 +816,44 @@ private int jjMoveNfa_3(int startState,
{
if (kind > 61)
kind = 61;
- jjCheckNAdd(63);
+ jjCheckNAdd(67);
}
else if (curChar == 92)
- jjCheckNAddStates(29, 32);
+ jjCheckNAddStates(32, 35);
else if (curChar == 123)
- jjstateSet[jjnewStateCnt++] = 65;
+ jjstateSet[jjnewStateCnt++] = 69;
else if (curChar == 124)
- jjstateSet[jjnewStateCnt++] = 40;
+ jjstateSet[jjnewStateCnt++] = 44;
if (curChar == 110)
- jjAddStates(33, 34);
+ jjAddStates(36, 37);
else if (curChar == 103)
- jjAddStates(35, 36);
+ jjAddStates(38, 39);
else if (curChar == 108)
- jjAddStates(37, 38);
+ jjAddStates(40, 41);
else if (curChar == 101)
- jjstateSet[jjnewStateCnt++] = 52;
+ jjstateSet[jjnewStateCnt++] = 56;
else if (curChar == 111)
- jjstateSet[jjnewStateCnt++] = 42;
+ jjstateSet[jjnewStateCnt++] = 46;
else if (curChar == 97)
- jjstateSet[jjnewStateCnt++] = 38;
+ jjstateSet[jjnewStateCnt++] = 42;
break;
case 6:
if (kind > 18)
kind = 18;
break;
case 11:
- jjCheckNAddStates(13, 15);
+ jjCheckNAddStates(14, 17);
break;
- case 13:
+ case 15:
if (curChar == 92)
- jjAddStates(39, 44);
- break;
- case 14:
- if ((0x14404410000000L & l) != 0L)
- jjCheckNAddStates(13, 15);
- break;
- case 19:
- if (curChar == 117)
- jjstateSet[jjnewStateCnt++] = 20;
+ jjAddStates(42, 47);
break;
- case 20:
- if ((0x7e0000007eL & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 21;
+ case 16:
+ if ((0x14404400000000L & l) != 0L)
+ jjCheckNAddStates(14, 17);
break;
case 21:
- if ((0x7e0000007eL & l) != 0L)
+ if (curChar == 117)
jjstateSet[jjnewStateCnt++] = 22;
break;
case 22:
@@ -864,148 +862,156 @@ private int jjMoveNfa_3(int startState,
break;
case 23:
if ((0x7e0000007eL & l) != 0L)
- jjCheckNAddStates(13, 15);
+ jjstateSet[jjnewStateCnt++] = 24;
+ break;
+ case 24:
+ if ((0x7e0000007eL & l) != 0L)
+ jjstateSet[jjnewStateCnt++] = 25;
break;
- case 27:
- jjAddStates(10, 12);
+ case 25:
+ if ((0x7e0000007eL & l) != 0L)
+ jjCheckNAddStates(14, 17);
break;
- case 28:
+ case 29:
+ jjAddStates(10, 13);
+ break;
+ case 32:
if (curChar == 92)
- jjAddStates(25, 26);
+ jjAddStates(28, 29);
break;
- case 37:
+ case 41:
if (curChar == 100 && kind > 41)
kind = 41;
break;
- case 38:
+ case 42:
if (curChar == 110)
- jjstateSet[jjnewStateCnt++] = 37;
+ jjstateSet[jjnewStateCnt++] = 41;
break;
- case 39:
+ case 43:
if (curChar == 97)
- jjstateSet[jjnewStateCnt++] = 38;
+ jjstateSet[jjnewStateCnt++] = 42;
break;
- case 40:
+ case 44:
if (curChar == 124 && kind > 42)
kind = 42;
break;
- case 41:
+ case 45:
if (curChar == 124)
- jjstateSet[jjnewStateCnt++] = 40;
+ jjstateSet[jjnewStateCnt++] = 44;
break;
- case 42:
+ case 46:
if (curChar == 114 && kind > 42)
kind = 42;
break;
- case 43:
+ case 47:
if (curChar == 111)
- jjstateSet[jjnewStateCnt++] = 42;
+ jjstateSet[jjnewStateCnt++] = 46;
break;
- case 52:
+ case 56:
if (curChar == 113 && kind > 47)
kind = 47;
break;
- case 53:
+ case 57:
if (curChar == 101)
- jjstateSet[jjnewStateCnt++] = 52;
+ jjstateSet[jjnewStateCnt++] = 56;
break;
- case 59:
+ case 63:
if ((0x2000000020L & l) != 0L)
- jjAddStates(45, 46);
+ jjAddStates(48, 49);
break;
- case 62:
+ case 66:
if ((0x7fffffe87ffffffL & l) == 0L)
break;
if (kind > 61)
kind = 61;
- jjCheckNAdd(63);
+ jjCheckNAdd(67);
break;
- case 63:
+ case 67:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 61)
kind = 61;
- jjCheckNAdd(63);
+ jjCheckNAdd(67);
break;
- case 64:
+ case 68:
if (curChar == 123)
- jjstateSet[jjnewStateCnt++] = 65;
+ jjstateSet[jjnewStateCnt++] = 69;
break;
- case 65:
+ case 69:
if ((0x7fffffe87ffffffL & l) != 0L)
- jjCheckNAddTwoStates(66, 67);
+ jjCheckNAddTwoStates(70, 71);
break;
- case 66:
+ case 70:
if ((0x7fffffe87fffffeL & l) != 0L)
- jjCheckNAddTwoStates(66, 67);
+ jjCheckNAddTwoStates(70, 71);
break;
- case 67:
+ case 71:
if (curChar == 125 && kind > 62)
kind = 62;
break;
- case 68:
+ case 72:
if (curChar == 92)
- jjCheckNAddStates(29, 32);
+ jjCheckNAddStates(32, 35);
break;
- case 69:
+ case 73:
if (curChar == 92)
- jjCheckNAddTwoStates(69, 70);
+ jjCheckNAddTwoStates(73, 74);
break;
- case 71:
+ case 75:
if (curChar == 92)
- jjCheckNAddTwoStates(71, 72);
+ jjCheckNAddTwoStates(75, 76);
break;
- case 73:
+ case 77:
if (curChar == 92)
- jjAddStates(47, 48);
+ jjAddStates(50, 51);
break;
- case 76:
+ case 80:
if (curChar == 108)
- jjAddStates(37, 38);
+ jjAddStates(40, 41);
break;
- case 77:
+ case 81:
if (curChar == 116 && kind > 43)
kind = 43;
break;
- case 78:
+ case 82:
if (curChar == 101 && kind > 44)
kind = 44;
break;
- case 79:
+ case 83:
if (curChar == 103)
- jjAddStates(35, 36);
+ jjAddStates(38, 39);
break;
- case 80:
+ case 84:
if (curChar == 116 && kind > 45)
kind = 45;
break;
- case 81:
+ case 85:
if (curChar == 101 && kind > 46)
kind = 46;
break;
- case 82:
+ case 86:
if (curChar == 110)
- jjAddStates(33, 34);
+ jjAddStates(36, 37);
break;
- case 83:
+ case 87:
if (curChar == 101 && kind > 48)
kind = 48;
break;
- case 84:
+ case 88:
if (curChar == 116 && kind > 49)
kind = 49;
break;
- case 85:
+ case 89:
if (curChar == 111)
- jjstateSet[jjnewStateCnt++] = 84;
+ jjstateSet[jjnewStateCnt++] = 88;
break;
- case 93:
+ case 97:
if ((0x2000000020L & l) != 0L)
- jjAddStates(49, 50);
+ jjAddStates(52, 53);
break;
- case 97:
+ case 101:
if ((0x2000000020L & l) != 0L)
- jjAddStates(51, 52);
+ jjAddStates(54, 55);
break;
default : break;
}
@@ -1028,11 +1034,11 @@ private int jjMoveNfa_3(int startState,
break;
case 11:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(13, 15);
+ jjAddStates(14, 17);
break;
- case 27:
+ case 29:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(10, 12);
+ jjAddStates(10, 13);
break;
default : break;
}
@@ -1045,7 +1051,7 @@ private int jjMoveNfa_3(int startState,
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 101 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 105 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -1157,10 +1163,10 @@ private int jjMoveNfa_11(int startState,
{
if (kind > 56)
kind = 56;
- jjCheckNAddStates(53, 58);
+ jjCheckNAddStates(56, 61);
}
else if (curChar == 45)
- jjCheckNAddStates(59, 62);
+ jjCheckNAddStates(62, 65);
else if (curChar == 36)
{
if (kind > 15)
@@ -1215,7 +1221,7 @@ private int jjMoveNfa_11(int startState,
break;
case 15:
if ((0x3ff000000000000L & l) != 0L)
- jjAddStates(63, 64);
+ jjAddStates(66, 67);
break;
case 19:
if (curChar == 36 && kind > 15)
@@ -1238,7 +1244,7 @@ private int jjMoveNfa_11(int startState,
break;
case 27:
if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(65, 67);
+ jjCheckNAddStates(68, 70);
break;
case 28:
if ((0x2400L & l) != 0L && kind > 51)
@@ -1255,7 +1261,7 @@ private int jjMoveNfa_11(int startState,
break;
case 38:
if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(68, 70);
+ jjCheckNAddStates(71, 73);
break;
case 39:
if ((0x2400L & l) != 0L && kind > 54)
@@ -1272,15 +1278,15 @@ private int jjMoveNfa_11(int startState,
break;
case 46:
if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(71, 73);
+ jjCheckNAddStates(74, 76);
break;
case 62:
if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(74, 76);
+ jjCheckNAddStates(77, 79);
break;
case 68:
if (curChar == 45)
- jjCheckNAddStates(59, 62);
+ jjCheckNAddStates(62, 65);
break;
case 69:
if ((0x3ff000000000000L & l) == 0L)
@@ -1346,7 +1352,7 @@ private int jjMoveNfa_11(int startState,
break;
if (kind > 56)
kind = 56;
- jjCheckNAddStates(53, 58);
+ jjCheckNAddStates(56, 61);
break;
default : break;
}
@@ -1367,11 +1373,11 @@ private int jjMoveNfa_11(int startState,
jjCheckNAdd(12);
}
else if (curChar == 123)
- jjAddStates(77, 80);
+ jjAddStates(80, 83);
else if (curChar == 92)
- jjCheckNAddStates(81, 84);
+ jjCheckNAddStates(84, 87);
if (curChar == 101)
- jjAddStates(85, 87);
+ jjAddStates(88, 90);
else if (curChar == 123)
jjstateSet[jjnewStateCnt++] = 14;
else if (curChar == 105)
@@ -1391,7 +1397,7 @@ private int jjMoveNfa_11(int startState,
break;
case 8:
if ((0x2000000020L & l) != 0L)
- jjAddStates(88, 89);
+ jjAddStates(91, 92);
break;
case 11:
if ((0x7fffffe87ffffffL & l) == 0L)
@@ -1425,7 +1431,7 @@ private int jjMoveNfa_11(int startState,
break;
case 17:
if (curChar == 92)
- jjCheckNAddStates(81, 84);
+ jjCheckNAddStates(84, 87);
break;
case 18:
if (curChar == 92)
@@ -1437,18 +1443,18 @@ private int jjMoveNfa_11(int startState,
break;
case 22:
if (curChar == 92)
- jjAddStates(90, 91);
+ jjAddStates(93, 94);
break;
case 25:
if (curChar == 101)
- jjAddStates(85, 87);
+ jjAddStates(88, 90);
break;
case 26:
if (curChar != 100)
break;
if (kind > 51)
kind = 51;
- jjCheckNAddStates(65, 67);
+ jjCheckNAddStates(68, 70);
break;
case 31:
if (curChar == 110)
@@ -1479,7 +1485,7 @@ private int jjMoveNfa_11(int startState,
break;
if (kind > 54)
kind = 54;
- jjCheckNAddStates(68, 70);
+ jjCheckNAddStates(71, 73);
break;
case 42:
if (curChar == 115)
@@ -1491,14 +1497,14 @@ private int jjMoveNfa_11(int startState,
break;
case 44:
if (curChar == 123)
- jjAddStates(77, 80);
+ jjAddStates(80, 83);
break;
case 45:
if (curChar != 125)
break;
if (kind > 51)
kind = 51;
- jjCheckNAddStates(71, 73);
+ jjCheckNAddStates(74, 76);
break;
case 48:
if (curChar == 100)
@@ -1557,7 +1563,7 @@ private int jjMoveNfa_11(int startState,
break;
if (kind > 54)
kind = 54;
- jjCheckNAddStates(74, 76);
+ jjCheckNAddStates(77, 79);
break;
case 64:
if (curChar == 101)
@@ -1577,11 +1583,11 @@ private int jjMoveNfa_11(int startState,
break;
case 75:
if ((0x2000000020L & l) != 0L)
- jjAddStates(92, 93);
+ jjAddStates(95, 96);
break;
case 79:
if ((0x2000000020L & l) != 0L)
- jjAddStates(35, 36);
+ jjAddStates(97, 98);
break;
default : break;
}
@@ -1776,7 +1782,7 @@ private int jjMoveNfa_8(int startState,
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(94, 97);
+ jjCheckNAddStates(99, 102);
break;
case 1:
if (kind > 18)
@@ -1792,7 +1798,7 @@ private int jjMoveNfa_8(int startState,
break;
case 9:
if (curChar == 92)
- jjAddStates(88, 89);
+ jjAddStates(91, 92);
break;
default : break;
}
@@ -1981,7 +1987,7 @@ private int jjMoveNfa_6(int startState,
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(94, 97);
+ jjCheckNAddStates(99, 102);
break;
case 1:
if (kind > 18)
@@ -1997,7 +2003,7 @@ private int jjMoveNfa_6(int startState,
break;
case 9:
if (curChar == 92)
- jjAddStates(88, 89);
+ jjAddStates(91, 92);
break;
default : break;
}
@@ -2168,7 +2174,7 @@ private int jjMoveNfa_5(int startState,
jjCheckNAdd(12);
}
else if (curChar == 35)
- jjCheckNAddStates(98, 100);
+ jjCheckNAddStates(103, 105);
else if (curChar == 36)
{
if (kind > 15)
@@ -2178,13 +2184,13 @@ private int jjMoveNfa_5(int startState,
if ((0x100000200L & l) != 0L)
jjCheckNAddTwoStates(0, 1);
else if (curChar == 36)
- jjCheckNAddStates(101, 104);
+ jjCheckNAddStates(106, 109);
break;
case 20:
if (curChar == 36)
jjCheckNAddTwoStates(33, 34);
else if (curChar == 35)
- jjAddStates(105, 106);
+ jjAddStates(110, 111);
if (curChar == 36)
{
if (kind > 15)
@@ -2201,7 +2207,7 @@ private int jjMoveNfa_5(int startState,
break;
case 3:
if (curChar == 32)
- jjAddStates(107, 108);
+ jjAddStates(112, 113);
break;
case 4:
if (curChar == 40 && kind > 14)
@@ -2225,7 +2231,7 @@ private int jjMoveNfa_5(int startState,
break;
case 21:
if (curChar == 35)
- jjAddStates(105, 106);
+ jjAddStates(110, 111);
break;
case 23:
if ((0x3ff000000000000L & l) == 0L)
@@ -2236,7 +2242,7 @@ private int jjMoveNfa_5(int startState,
break;
case 26:
if ((0x3ff000000000000L & l) != 0L)
- jjAddStates(109, 110);
+ jjAddStates(26, 27);
break;
case 30:
if (curChar == 36 && kind > 15)
@@ -2259,7 +2265,7 @@ private int jjMoveNfa_5(int startState,
break;
case 36:
if (curChar == 35)
- jjCheckNAddStates(98, 100);
+ jjCheckNAddStates(103, 105);
break;
case 37:
if (curChar == 42)
@@ -2288,7 +2294,7 @@ private int jjMoveNfa_5(int startState,
break;
case 40:
if (curChar == 92)
- jjAddStates(111, 112);
+ jjAddStates(114, 115);
if (curChar == 92)
jjCheckNAddTwoStates(31, 32);
if (curChar == 92)
@@ -2302,9 +2308,9 @@ private int jjMoveNfa_5(int startState,
jjCheckNAdd(12);
}
else if (curChar == 92)
- jjCheckNAddStates(113, 116);
+ jjCheckNAddStates(116, 119);
if (curChar == 92)
- jjAddStates(111, 112);
+ jjAddStates(114, 115);
break;
case 20:
if (curChar == 92)
@@ -2363,7 +2369,7 @@ private int jjMoveNfa_5(int startState,
break;
case 19:
if (curChar == 92)
- jjAddStates(111, 112);
+ jjAddStates(114, 115);
break;
case 22:
if ((0x7fffffe87ffffffL & l) == 0L)
@@ -2397,7 +2403,7 @@ private int jjMoveNfa_5(int startState,
break;
case 28:
if (curChar == 92)
- jjCheckNAddStates(113, 116);
+ jjCheckNAddStates(116, 119);
break;
case 29:
if (curChar == 92)
@@ -2409,7 +2415,7 @@ private int jjMoveNfa_5(int startState,
break;
case 33:
if (curChar == 92)
- jjAddStates(117, 118);
+ jjAddStates(28, 29);
break;
case 38:
if (kind > 18)
@@ -2616,7 +2622,7 @@ private int jjMoveNfa_9(int startState,
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(94, 97);
+ jjCheckNAddStates(99, 102);
break;
case 1:
if (kind > 18)
@@ -2632,7 +2638,7 @@ private int jjMoveNfa_9(int startState,
break;
case 9:
if (curChar == 92)
- jjAddStates(88, 89);
+ jjAddStates(91, 92);
break;
default : break;
}
@@ -2808,7 +2814,7 @@ private int jjStartNfaWithStates_2(int p
private int jjMoveNfa_2(int startState, int curPos)
{
int startsAt = 0;
- jjnewStateCnt = 55;
+ jjnewStateCnt = 59;
int i = 1;
jjstateSet[0] = startState;
int kind = 0x7fffffff;
@@ -2828,7 +2834,7 @@ private int jjMoveNfa_2(int startState,
{
if (kind > 56)
kind = 56;
- jjCheckNAddStates(119, 124);
+ jjCheckNAddStates(120, 125);
}
else if ((0x100002600L & l) != 0L)
{
@@ -2837,19 +2843,19 @@ private int jjMoveNfa_2(int startState,
jjCheckNAdd(4);
}
else if (curChar == 45)
- jjCheckNAddStates(125, 128);
+ jjCheckNAddStates(126, 129);
else if (curChar == 36)
{
if (kind > 15)
kind = 15;
- jjCheckNAddTwoStates(37, 38);
+ jjCheckNAddTwoStates(41, 42);
}
else if (curChar == 46)
- jjCheckNAdd(28);
+ jjCheckNAdd(32);
else if (curChar == 39)
- jjCheckNAddStates(129, 131);
+ jjCheckNAddStates(130, 133);
else if (curChar == 34)
- jjCheckNAddStates(132, 134);
+ jjCheckNAddStates(134, 137);
else if (curChar == 35)
jjstateSet[jjnewStateCnt++] = 2;
break;
@@ -2873,44 +2879,37 @@ private int jjMoveNfa_2(int startState,
jjCheckNAdd(4);
break;
case 5:
+ case 7:
if (curChar == 34)
- jjCheckNAddStates(132, 134);
+ jjCheckNAddStates(134, 137);
break;
case 6:
if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddStates(132, 134);
+ jjCheckNAddStates(134, 137);
break;
- case 7:
- if (curChar == 34 && kind > 32)
- kind = 32;
+ case 8:
+ if (curChar == 34)
+ jjstateSet[jjnewStateCnt++] = 7;
break;
case 9:
- if ((0x8400000000L & l) != 0L)
- jjCheckNAddStates(132, 134);
+ if (curChar == 34 && kind > 32)
+ kind = 32;
break;
- case 10:
+ case 12:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(135, 138);
+ jjCheckNAddStates(138, 142);
break;
- case 11:
+ case 13:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(132, 134);
+ jjCheckNAddStates(134, 137);
break;
- case 12:
+ case 14:
if ((0xf000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 13;
- break;
- case 13:
- if ((0xff000000000000L & l) != 0L)
- jjCheckNAdd(11);
+ jjstateSet[jjnewStateCnt++] = 15;
break;
case 15:
- if ((0x3ff000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 16;
- break;
- case 16:
- if ((0x3ff000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 17;
+ if ((0xff000000000000L & l) != 0L)
+ jjCheckNAdd(13);
break;
case 17:
if ((0x3ff000000000000L & l) != 0L)
@@ -2918,146 +2917,159 @@ private int jjMoveNfa_2(int startState,
break;
case 18:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(132, 134);
+ jjstateSet[jjnewStateCnt++] = 19;
break;
case 19:
- if (curChar == 32)
- jjAddStates(139, 140);
+ if ((0x3ff000000000000L & l) != 0L)
+ jjstateSet[jjnewStateCnt++] = 20;
break;
case 20:
- if (curChar == 10)
- jjCheckNAddStates(132, 134);
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddStates(134, 137);
break;
case 21:
- if (curChar == 39)
- jjCheckNAddStates(129, 131);
+ if (curChar == 32)
+ jjAddStates(143, 144);
break;
case 22:
- if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddStates(129, 131);
+ if (curChar == 10)
+ jjCheckNAddStates(134, 137);
+ break;
+ case 23:
+ case 25:
+ if (curChar == 39)
+ jjCheckNAddStates(130, 133);
break;
case 24:
+ if ((0xffffff7fffffffffL & l) != 0L)
+ jjCheckNAddStates(130, 133);
+ break;
+ case 26:
+ if (curChar == 39)
+ jjstateSet[jjnewStateCnt++] = 25;
+ break;
+ case 28:
if (curChar == 32)
- jjAddStates(23, 24);
+ jjAddStates(145, 146);
break;
- case 25:
+ case 29:
if (curChar == 10)
- jjCheckNAddStates(129, 131);
+ jjCheckNAddStates(130, 133);
break;
- case 26:
+ case 30:
if (curChar == 39 && kind > 32)
kind = 32;
break;
- case 27:
+ case 31:
if (curChar == 46)
- jjCheckNAdd(28);
+ jjCheckNAdd(32);
break;
- case 28:
+ case 32:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAddTwoStates(28, 29);
+ jjCheckNAddTwoStates(32, 33);
break;
- case 30:
+ case 34:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(31);
+ jjCheckNAdd(35);
break;
- case 31:
+ case 35:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(31);
+ jjCheckNAdd(35);
break;
- case 34:
+ case 38:
if (curChar == 36 && kind > 15)
kind = 15;
break;
- case 36:
+ case 40:
if (curChar == 36)
- jjCheckNAddTwoStates(37, 38);
+ jjCheckNAddTwoStates(41, 42);
break;
- case 38:
+ case 42:
if (curChar == 33 && kind > 16)
kind = 16;
break;
- case 39:
+ case 43:
if (curChar != 36)
break;
if (kind > 15)
kind = 15;
- jjCheckNAddTwoStates(37, 38);
+ jjCheckNAddTwoStates(41, 42);
break;
- case 40:
+ case 44:
if (curChar == 45)
- jjCheckNAddStates(125, 128);
+ jjCheckNAddStates(126, 129);
break;
- case 41:
+ case 45:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 56)
kind = 56;
- jjCheckNAddTwoStates(41, 43);
+ jjCheckNAddTwoStates(45, 47);
break;
- case 42:
+ case 46:
if (curChar == 46 && kind > 56)
kind = 56;
break;
- case 43:
+ case 47:
if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 42;
+ jjstateSet[jjnewStateCnt++] = 46;
break;
- case 44:
+ case 48:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(44, 45);
+ jjCheckNAddTwoStates(48, 49);
break;
- case 45:
+ case 49:
if (curChar != 46)
break;
if (kind > 57)
kind = 57;
- jjCheckNAddTwoStates(46, 47);
+ jjCheckNAddTwoStates(50, 51);
break;
- case 46:
+ case 50:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAddTwoStates(46, 47);
+ jjCheckNAddTwoStates(50, 51);
break;
- case 48:
+ case 52:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(49);
+ jjCheckNAdd(53);
break;
- case 49:
+ case 53:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(49);
+ jjCheckNAdd(53);
break;
- case 50:
+ case 54:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(50, 51);
+ jjCheckNAddTwoStates(54, 55);
break;
- case 52:
+ case 56:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(53);
+ jjCheckNAdd(57);
break;
- case 53:
+ case 57:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(53);
+ jjCheckNAdd(57);
break;
- case 54:
+ case 58:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 56)
kind = 56;
- jjCheckNAddStates(119, 124);
+ jjCheckNAddStates(120, 125);
break;
default : break;
}
@@ -3072,33 +3084,25 @@ private int jjMoveNfa_2(int startState,
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(141, 144);
+ jjCheckNAddStates(147, 150);
break;
case 1:
if (kind > 18)
kind = 18;
break;
case 6:
- jjCheckNAddStates(132, 134);
+ jjCheckNAddStates(134, 137);
break;
- case 8:
+ case 10:
if (curChar == 92)
- jjAddStates(145, 150);
- break;
- case 9:
- if ((0x14404410000000L & l) != 0L)
- jjCheckNAddStates(132, 134);
- break;
- case 14:
- if (curChar == 117)
- jjstateSet[jjnewStateCnt++] = 15;
+ jjAddStates(151, 156);
break;
- case 15:
- if ((0x7e0000007eL & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 16;
+ case 11:
+ if ((0x14404400000000L & l) != 0L)
+ jjCheckNAddStates(134, 137);
break;
case 16:
- if ((0x7e0000007eL & l) != 0L)
+ if (curChar == 117)
jjstateSet[jjnewStateCnt++] = 17;
break;
case 17:
@@ -3107,38 +3111,46 @@ private int jjMoveNfa_2(int startState,
break;
case 18:
if ((0x7e0000007eL & l) != 0L)
- jjCheckNAddStates(132, 134);
+ jjstateSet[jjnewStateCnt++] = 19;
+ break;
+ case 19:
+ if ((0x7e0000007eL & l) != 0L)
+ jjstateSet[jjnewStateCnt++] = 20;
+ break;
+ case 20:
+ if ((0x7e0000007eL & l) != 0L)
+ jjCheckNAddStates(134, 137);
break;
- case 22:
- jjAddStates(129, 131);
+ case 24:
+ jjAddStates(130, 133);
break;
- case 23:
+ case 27:
if (curChar == 92)
- jjAddStates(23, 24);
+ jjAddStates(145, 146);
break;
- case 29:
+ case 33:
if ((0x2000000020L & l) != 0L)
- jjAddStates(151, 152);
+ jjAddStates(157, 158);
break;
- case 33:
+ case 37:
if (curChar == 92)
- jjCheckNAddTwoStates(33, 34);
+ jjCheckNAddTwoStates(37, 38);
break;
- case 35:
+ case 39:
if (curChar == 92)
- jjCheckNAddTwoStates(35, 36);
+ jjCheckNAddTwoStates(39, 40);
break;
- case 37:
+ case 41:
if (curChar == 92)
- jjAddStates(153, 154);
+ jjAddStates(159, 160);
break;
- case 47:
+ case 51:
if ((0x2000000020L & l) != 0L)
- jjAddStates(155, 156);
+ jjAddStates(161, 162);
break;
- case 51:
+ case 55:
if ((0x2000000020L & l) != 0L)
- jjAddStates(157, 158);
+ jjAddStates(163, 164);
break;
default : break;
}
@@ -3161,11 +3173,11 @@ private int jjMoveNfa_2(int startState,
break;
case 6:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(132, 134);
+ jjAddStates(134, 137);
break;
- case 22:
+ case 24:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(129, 131);
+ jjAddStates(130, 133);
break;
default : break;
}
@@ -3178,7 +3190,7 @@ private int jjMoveNfa_2(int startState,
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 55 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 59 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -3354,7 +3366,7 @@ private int jjMoveNfa_10(int startState,
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(159, 162);
+ jjCheckNAddStates(165, 168);
break;
case 1:
if (kind > 18)
@@ -3370,7 +3382,7 @@ private int jjMoveNfa_10(int startState,
break;
case 12:
if (curChar == 92)
- jjAddStates(163, 164);
+ jjAddStates(169, 170);
break;
default : break;
}
@@ -3602,7 +3614,7 @@ private int jjMoveNfa_0(int startState,
if ((0x100000200L & l) != 0L)
jjCheckNAddTwoStates(0, 1);
else if (curChar == 35)
- jjCheckNAddStates(165, 167);
+ jjCheckNAddStates(171, 173);
else if (curChar == 36)
{
if (kind > 15)
@@ -3612,7 +3624,7 @@ private int jjMoveNfa_0(int startState,
else if (curChar == 46)
jjstateSet[jjnewStateCnt++] = 15;
if (curChar == 36)
- jjCheckNAddStates(168, 171);
+ jjCheckNAddStates(174, 177);
break;
case 33:
if (curChar == 42)
@@ -3628,7 +3640,7 @@ private int jjMoveNfa_0(int startState,
break;
case 3:
if (curChar == 32)
- jjAddStates(107, 108);
+ jjAddStates(112, 113);
break;
case 4:
if (curChar == 40 && kind > 14)
@@ -3647,7 +3659,7 @@ private int jjMoveNfa_0(int startState,
break;
case 16:
if (curChar == 36)
- jjCheckNAddStates(168, 171);
+ jjCheckNAddStates(174, 177);
break;
case 18:
case 19:
@@ -3679,7 +3691,7 @@ private int jjMoveNfa_0(int startState,
break;
case 30:
if (curChar == 35)
- jjCheckNAddStates(165, 167);
+ jjCheckNAddStates(171, 173);
break;
case 31:
if (curChar == 42)
@@ -3708,7 +3720,7 @@ private int jjMoveNfa_0(int startState,
jjCheckNAdd(13);
}
else if (curChar == 92)
- jjCheckNAddStates(172, 175);
+ jjCheckNAddStates(178, 181);
break;
case 33:
if (curChar == 123)
@@ -3769,7 +3781,7 @@ private int jjMoveNfa_0(int startState,
break;
case 22:
if (curChar == 92)
- jjCheckNAddStates(172, 175);
+ jjCheckNAddStates(178, 181);
break;
case 23:
if (curChar == 92)
@@ -3781,7 +3793,7 @@ private int jjMoveNfa_0(int startState,
break;
case 27:
if (curChar == 92)
- jjAddStates(176, 177);
+ jjAddStates(182, 183);
break;
case 32:
if (kind > 18)
@@ -3828,42 +3840,42 @@ private final int jjStopStringLiteralDfa
switch (pos)
{
case 0:
+ if ((active0 & 0x1a0000L) != 0L)
+ return 52;
+ if ((active0 & 0x40L) != 0L)
+ return 74;
if ((active0 & 0x600000000L) != 0L)
{
jjmatchedKind = 66;
- return 36;
+ return 40;
}
- if ((active0 & 0x1a0000L) != 0L)
- return 48;
- if ((active0 & 0x40L) != 0L)
- return 70;
return -1;
case 1:
- if ((active0 & 0x80000L) != 0L)
- return 46;
if ((active0 & 0x600000000L) != 0L)
{
jjmatchedKind = 66;
jjmatchedPos = 1;
- return 36;
+ return 40;
}
+ if ((active0 & 0x80000L) != 0L)
+ return 50;
return -1;
case 2:
if ((active0 & 0x600000000L) != 0L)
{
jjmatchedKind = 66;
jjmatchedPos = 2;
- return 36;
+ return 40;
}
return -1;
case 3:
if ((active0 & 0x200000000L) != 0L)
- return 36;
+ return 40;
if ((active0 & 0x400000000L) != 0L)
{
jjmatchedKind = 66;
jjmatchedPos = 3;
- return 36;
+ return 40;
}
return -1;
default :
@@ -3916,7 +3928,7 @@ private int jjMoveStringLiteralDfa1_4(lo
{
case 42:
if ((active0 & 0x80000L) != 0L)
- return jjStartNfaWithStates_4(1, 19, 46);
+ return jjStartNfaWithStates_4(1, 19, 50);
break;
case 46:
if ((active0 & 0x40L) != 0L)
@@ -3970,7 +3982,7 @@ private int jjMoveStringLiteralDfa3_4(lo
{
case 101:
if ((active0 & 0x200000000L) != 0L)
- return jjStartNfaWithStates_4(3, 33, 36);
+ return jjStartNfaWithStates_4(3, 33, 40);
break;
case 115:
return jjMoveStringLiteralDfa4_4(active0, 0x400000000L);
@@ -3992,7 +4004,7 @@ private int jjMoveStringLiteralDfa4_4(lo
{
case 101:
if ((active0 & 0x400000000L) != 0L)
- return jjStartNfaWithStates_4(4, 34, 36);
+ return jjStartNfaWithStates_4(4, 34, 40);
break;
default :
break;
@@ -4010,7 +4022,7 @@ private int jjStartNfaWithStates_4(int p
private int jjMoveNfa_4(int startState, int curPos)
{
int startsAt = 0;
- jjnewStateCnt = 71;
+ jjnewStateCnt = 75;
int i = 1;
jjstateSet[0] = startState;
int kind = 0x7fffffff;
@@ -4025,12 +4037,24 @@ private int jjMoveNfa_4(int startState,
{
switch(jjstateSet[--i])
{
+ case 52:
+ if (curChar == 42)
+ jjstateSet[jjnewStateCnt++] = 50;
+ break;
+ case 74:
+ case 64:
+ if ((0x3ff000000000000L & l) == 0L)
+ break;
+ if (kind > 57)
+ kind = 57;
+ jjCheckNAddTwoStates(64, 65);
+ break;
case 13:
if ((0x3ff000000000000L & l) != 0L)
{
if (kind > 56)
kind = 56;
- jjCheckNAddStates(178, 183);
+ jjCheckNAddStates(184, 189);
}
else if ((0x100002600L & l) != 0L)
{
@@ -4039,36 +4063,24 @@ private int jjMoveNfa_4(int startState,
jjCheckNAdd(12);
}
else if (curChar == 46)
- jjCheckNAddTwoStates(60, 70);
+ jjCheckNAddTwoStates(64, 74);
else if (curChar == 45)
- jjCheckNAddStates(184, 187);
+ jjCheckNAddStates(190, 193);
else if (curChar == 35)
- jjCheckNAddStates(188, 190);
+ jjCheckNAddStates(194, 196);
else if (curChar == 36)
{
if (kind > 15)
kind = 15;
- jjCheckNAddTwoStates(42, 43);
+ jjCheckNAddTwoStates(46, 47);
}
else if (curChar == 39)
- jjCheckNAddStates(191, 193);
+ jjCheckNAddStates(197, 200);
else if (curChar == 34)
- jjCheckNAddStates(194, 196);
+ jjCheckNAddStates(201, 204);
if ((0x100000200L & l) != 0L)
jjCheckNAddTwoStates(0, 1);
break;
- case 70:
- case 60:
- if ((0x3ff000000000000L & l) == 0L)
- break;
- if (kind > 57)
- kind = 57;
- jjCheckNAddTwoStates(60, 61);
- break;
- case 48:
- if (curChar == 42)
- jjstateSet[jjnewStateCnt++] = 46;
- break;
case 0:
if ((0x100000200L & l) != 0L)
jjCheckNAddTwoStates(0, 1);
@@ -4079,7 +4091,7 @@ private int jjMoveNfa_4(int startState,
break;
case 3:
if (curChar == 32)
- jjAddStates(107, 108);
+ jjAddStates(112, 113);
break;
case 4:
if (curChar == 40 && kind > 14)
@@ -4094,39 +4106,35 @@ private int jjMoveNfa_4(int startState,
break;
case 14:
if ((0xfffffffbffffffffL & l) != 0L)
- jjCheckNAddStates(194, 196);
+ jjCheckNAddStates(201, 204);
break;
case 15:
- if (curChar == 34 && kind > 32)
- kind = 32;
+ if (curChar == 34)
+ jjCheckNAddStates(201, 204);
+ break;
+ case 16:
+ if (curChar == 34)
+ jjstateSet[jjnewStateCnt++] = 15;
break;
case 17:
- if ((0x8400000000L & l) != 0L)
- jjCheckNAddStates(194, 196);
+ if (curChar == 34 && kind > 32)
+ kind = 32;
break;
- case 18:
+ case 20:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(197, 200);
+ jjCheckNAddStates(205, 209);
break;
- case 19:
+ case 21:
if ((0xff000000000000L & l) != 0L)
- jjCheckNAddStates(194, 196);
+ jjCheckNAddStates(201, 204);
break;
- case 20:
+ case 22:
if ((0xf000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 21;
- break;
- case 21:
- if ((0xff000000000000L & l) != 0L)
- jjCheckNAdd(19);
+ jjstateSet[jjnewStateCnt++] = 23;
break;
case 23:
- if ((0x3ff000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 24;
- break;
- case 24:
- if ((0x3ff000000000000L & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 25;
+ if ((0xff000000000000L & l) != 0L)
+ jjCheckNAdd(21);
break;
case 25:
if ((0x3ff000000000000L & l) != 0L)
@@ -4134,162 +4142,175 @@ private int jjMoveNfa_4(int startState,
break;
case 26:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddStates(194, 196);
+ jjstateSet[jjnewStateCnt++] = 27;
break;
case 27:
- if (curChar == 32)
- jjAddStates(176, 177);
+ if ((0x3ff000000000000L & l) != 0L)
+ jjstateSet[jjnewStateCnt++] = 28;
break;
case 28:
- if (curChar == 10)
- jjCheckNAddStates(194, 196);
+ if ((0x3ff000000000000L & l) != 0L)
+ jjCheckNAddStates(201, 204);
break;
case 29:
- if (curChar == 39)
- jjCheckNAddStates(191, 193);
+ if (curChar == 32)
+ jjAddStates(210, 211);
break;
case 30:
- if ((0xffffff7fffffffffL & l) != 0L)
- jjCheckNAddStates(191, 193);
+ if (curChar == 10)
+ jjCheckNAddStates(201, 204);
+ break;
+ case 31:
+ case 33:
+ if (curChar == 39)
+ jjCheckNAddStates(197, 200);
break;
case 32:
+ if ((0xffffff7fffffffffL & l) != 0L)
+ jjCheckNAddStates(197, 200);
+ break;
+ case 34:
+ if (curChar == 39)
+ jjstateSet[jjnewStateCnt++] = 33;
+ break;
+ case 36:
if (curChar == 32)
- jjAddStates(201, 202);
+ jjAddStates(212, 213);
break;
- case 33:
+ case 37:
if (curChar == 10)
- jjCheckNAddStates(191, 193);
+ jjCheckNAddStates(197, 200);
break;
- case 34:
+ case 38:
if (curChar == 39 && kind > 32)
kind = 32;
break;
- case 36:
+ case 40:
if ((0x3ff200000000000L & l) == 0L)
break;
if (kind > 66)
kind = 66;
- jjstateSet[jjnewStateCnt++] = 36;
+ jjstateSet[jjnewStateCnt++] = 40;
break;
- case 39:
+ case 43:
if (curChar == 36 && kind > 15)
kind = 15;
break;
- case 41:
+ case 45:
if (curChar == 36)
- jjCheckNAddTwoStates(42, 43);
+ jjCheckNAddTwoStates(46, 47);
break;
- case 43:
+ case 47:
if (curChar == 33 && kind > 16)
kind = 16;
break;
- case 44:
+ case 48:
if (curChar != 36)
break;
if (kind > 15)
kind = 15;
- jjCheckNAddTwoStates(42, 43);
+ jjCheckNAddTwoStates(46, 47);
break;
- case 45:
+ case 49:
if (curChar == 35)
- jjCheckNAddStates(188, 190);
+ jjCheckNAddStates(194, 196);
break;
- case 46:
+ case 50:
if (curChar == 42)
- jjstateSet[jjnewStateCnt++] = 47;
+ jjstateSet[jjnewStateCnt++] = 51;
break;
- case 47:
+ case 51:
if ((0xfffffff7ffffffffL & l) != 0L && kind > 18)
kind = 18;
break;
- case 49:
+ case 53:
if (curChar == 45)
- jjCheckNAddStates(184, 187);
+ jjCheckNAddStates(190, 193);
break;
- case 50:
+ case 54:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 56)
kind = 56;
- jjCheckNAddTwoStates(50, 52);
+ jjCheckNAddTwoStates(54, 56);
break;
- case 51:
+ case 55:
if (curChar == 46 && kind > 56)
kind = 56;
break;
- case 52:
+ case 56:
if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 51;
+ jjstateSet[jjnewStateCnt++] = 55;
break;
- case 53:
+ case 57:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(53, 54);
+ jjCheckNAddTwoStates(57, 58);
break;
- case 54:
+ case 58:
if (curChar != 46)
break;
if (kind > 57)
kind = 57;
- jjCheckNAddTwoStates(55, 56);
+ jjCheckNAddTwoStates(59, 60);
break;
- case 55:
+ case 59:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAddTwoStates(55, 56);
+ jjCheckNAddTwoStates(59, 60);
break;
- case 57:
+ case 61:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(58);
+ jjCheckNAdd(62);
break;
- case 58:
+ case 62:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(58);
+ jjCheckNAdd(62);
break;
- case 59:
+ case 63:
if (curChar == 46)
- jjCheckNAdd(60);
+ jjCheckNAdd(64);
break;
- case 62:
+ case 66:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(63);
+ jjCheckNAdd(67);
break;
- case 63:
+ case 67:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(63);
+ jjCheckNAdd(67);
break;
- case 64:
+ case 68:
if ((0x3ff000000000000L & l) != 0L)
- jjCheckNAddTwoStates(64, 65);
+ jjCheckNAddTwoStates(68, 69);
break;
- case 66:
+ case 70:
if ((0x280000000000L & l) != 0L)
- jjCheckNAdd(67);
+ jjCheckNAdd(71);
break;
- case 67:
+ case 71:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 57)
kind = 57;
- jjCheckNAdd(67);
+ jjCheckNAdd(71);
break;
- case 68:
+ case 72:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 56)
kind = 56;
- jjCheckNAddStates(178, 183);
+ jjCheckNAddStates(184, 189);
break;
- case 69:
+ case 73:
if (curChar == 46)
- jjCheckNAddTwoStates(60, 70);
+ jjCheckNAddTwoStates(64, 74);
break;
default : break;
}
@@ -4302,25 +4323,25 @@ private int jjMoveNfa_4(int startState,
{
switch(jjstateSet[--i])
{
+ case 52:
+ if (curChar == 123)
+ jjstateSet[jjnewStateCnt++] = 10;
+ else if (curChar == 115)
+ jjstateSet[jjnewStateCnt++] = 5;
+ break;
+ case 74:
+ if ((0x7fffffe07fffffeL & l) != 0L && kind > 67)
+ kind = 67;
+ break;
case 13:
if ((0x7fffffe87fffffeL & l) != 0L)
{
if (kind > 66)
kind = 66;
- jjCheckNAdd(36);
+ jjCheckNAdd(40);
}
else if (curChar == 92)
- jjCheckNAddStates(203, 206);
- break;
- case 70:
- if ((0x7fffffe07fffffeL & l) != 0L && kind > 67)
- kind = 67;
- break;
- case 48:
- if (curChar == 123)
- jjstateSet[jjnewStateCnt++] = 10;
- else if (curChar == 115)
- jjstateSet[jjnewStateCnt++] = 5;
+ jjCheckNAddStates(214, 217);
break;
case 2:
if (curChar == 116)
@@ -4355,26 +4376,18 @@ private int jjMoveNfa_4(int startState,
jjstateSet[jjnewStateCnt++] = 10;
break;
case 14:
- jjCheckNAddStates(194, 196);
+ jjCheckNAddStates(201, 204);
break;
- case 16:
+ case 18:
if (curChar == 92)
- jjAddStates(207, 212);
- break;
- case 17:
- if ((0x14404410000000L & l) != 0L)
- jjCheckNAddStates(194, 196);
- break;
- case 22:
- if (curChar == 117)
- jjstateSet[jjnewStateCnt++] = 23;
+ jjAddStates(218, 223);
break;
- case 23:
- if ((0x7e0000007eL & l) != 0L)
- jjstateSet[jjnewStateCnt++] = 24;
+ case 19:
+ if ((0x14404400000000L & l) != 0L)
+ jjCheckNAddStates(201, 204);
break;
case 24:
- if ((0x7e0000007eL & l) != 0L)
+ if (curChar == 117)
jjstateSet[jjnewStateCnt++] = 25;
break;
case 25:
@@ -4383,54 +4396,62 @@ private int jjMoveNfa_4(int startState,
break;
case 26:
if ((0x7e0000007eL & l) != 0L)
- jjCheckNAddStates(194, 196);
+ jjstateSet[jjnewStateCnt++] = 27;
break;
- case 30:
- jjAddStates(191, 193);
+ case 27:
+ if ((0x7e0000007eL & l) != 0L)
+ jjstateSet[jjnewStateCnt++] = 28;
break;
- case 31:
- if (curChar == 92)
- jjAddStates(201, 202);
+ case 28:
+ if ((0x7e0000007eL & l) != 0L)
+ jjCheckNAddStates(201, 204);
+ break;
+ case 32:
+ jjAddStates(197, 200);
break;
case 35:
- case 36:
+ if (curChar == 92)
+ jjAddStates(212, 213);
+ break;
+ case 39:
+ case 40:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 66)
kind = 66;
- jjCheckNAdd(36);
+ jjCheckNAdd(40);
break;
- case 37:
+ case 41:
if (curChar == 92)
- jjCheckNAddStates(203, 206);
+ jjCheckNAddStates(214, 217);
break;
- case 38:
+ case 42:
if (curChar == 92)
- jjCheckNAddTwoStates(38, 39);
+ jjCheckNAddTwoStates(42, 43);
break;
- case 40:
+ case 44:
if (curChar == 92)
- jjCheckNAddTwoStates(40, 41);
+ jjCheckNAddTwoStates(44, 45);
break;
- case 42:
+ case 46:
if (curChar == 92)
- jjAddStates(213, 214);
+ jjAddStates(224, 225);
break;
- case 47:
+ case 51:
if (kind > 18)
kind = 18;
break;
- case 56:
+ case 60:
if ((0x2000000020L & l) != 0L)
- jjAddStates(215, 216);
+ jjAddStates(226, 227);
break;
- case 61:
+ case 65:
if ((0x2000000020L & l) != 0L)
- jjAddStates(217, 218);
+ jjAddStates(228, 229);
break;
- case 65:
+ case 69:
if ((0x2000000020L & l) != 0L)
- jjAddStates(27, 28);
+ jjAddStates(30, 31);
break;
default : break;
}
@@ -4449,13 +4470,13 @@ private int jjMoveNfa_4(int startState,
{
case 14:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(194, 196);
+ jjAddStates(201, 204);
break;
- case 30:
+ case 32:
if (jjCanMove_0(hiByte, i1, i2, l1, l2))
- jjAddStates(191, 193);
+ jjAddStates(197, 200);
break;
- case 47:
+ case 51:
if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 18)
kind = 18;
break;
@@ -4470,7 +4491,7 @@ private int jjMoveNfa_4(int startState,
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 71 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 75 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -4668,7 +4689,7 @@ private int jjMoveNfa_1(int startState,
if ((0x100000200L & l) != 0L)
jjCheckNAddTwoStates(0, 1);
else if (curChar == 35)
- jjCheckNAddStates(219, 221);
+ jjCheckNAddStates(230, 232);
else if (curChar == 36)
{
if (kind > 15)
@@ -4692,7 +4713,7 @@ private int jjMoveNfa_1(int startState,
break;
case 3:
if (curChar == 32)
- jjAddStates(107, 108);
+ jjAddStates(112, 113);
break;
case 4:
if (curChar == 40 && kind > 14)
@@ -4730,7 +4751,7 @@ private int jjMoveNfa_1(int startState,
break;
case 24:
if (curChar == 35)
- jjCheckNAddStates(219, 221);
+ jjCheckNAddStates(230, 232);
break;
case 25:
if (curChar == 42)
@@ -4759,7 +4780,7 @@ private int jjMoveNfa_1(int startState,
jjCheckNAdd(13);
[... 101 lines stripped ...]