geirm 00/12/20 21:56:04
Modified: src/java/org/apache/velocity/runtime/parser Parser.java
Parser.jj ParserTokenManager.java
Log:
Parser.jjt followers
Revision Changes Path
1.47 +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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Parser.java 2000/12/21 04:43:58 1.46
+++ Parser.java 2000/12/21 05:56:02 1.47
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.java,v 1.46 2000/12/21 04:43:58 geirm Exp $
+ * @version $Id: Parser.java,v 1.47 2000/12/21 05:56:02 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants, ParserConstants
{/*@bgen(jjtree)*/
protected JJTParserState jjtree = new JJTParserState();/**
1.45 +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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Parser.jj 2000/12/21 04:43:58 1.44
+++ Parser.jj 2000/12/21 05:56:02 1.45
@@ -96,7 +96,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Parser.jj,v 1.44 2000/12/21 04:43:58 geirm Exp $
+ * @version $Id: Parser.jj,v 1.45 2000/12/21 05:56:02 geirm Exp $
*/
public class Parser/*@bgen(jjtree)*/implements ParserTreeConstants/*@egen*/
{/*@bgen(jjtree)*/
@@ -703,7 +703,7 @@
<REFERENCE,DIRECTIVE,REFMODIFIER,REFMOD2>
TOKEN :
{
- <STRING_LITERAL: ( "\"" ( ~["\"","\n","\r"] )* "\"" ) >
+ <STRING_LITERAL: ( "\"" ( ~["\"","\n","\r"] )* "\"" ) | ( "'" ( ~["'","\n","\r"]
)* "'" ) >
{
/*
* - if we are in REFERENCE || REFMODIFIER then " is an ender
1.36 +256 -172
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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ParserTokenManager.java 2000/12/19 13:35:20 1.35
+++ ParserTokenManager.java 2000/12/21 05:56:03 1.36
@@ -168,7 +168,7 @@
if ((active0 & 0x3000000L) != 0L)
{
jjmatchedKind = 50;
- return 17;
+ return 20;
}
if ((active0 & 0x6800L) != 0L)
return 7;
@@ -180,7 +180,7 @@
{
jjmatchedKind = 50;
jjmatchedPos = 1;
- return 17;
+ return 20;
}
return -1;
case 2:
@@ -188,7 +188,7 @@
{
jjmatchedKind = 50;
jjmatchedPos = 2;
- return 17;
+ return 20;
}
return -1;
case 3:
@@ -196,10 +196,10 @@
{
jjmatchedKind = 50;
jjmatchedPos = 3;
- return 17;
+ return 20;
}
if ((active0 & 0x1000000L) != 0L)
- return 17;
+ return 20;
return -1;
default :
return -1;
@@ -349,7 +349,7 @@
{
case 101:
if ((active0 & 0x1000000L) != 0L)
- return jjStartNfaWithStates_0(3, 24, 17);
+ return jjStartNfaWithStates_0(3, 24, 20);
break;
case 115:
return jjMoveStringLiteralDfa4_0(active0, 0x2000000L);
@@ -371,7 +371,7 @@
{
case 101:
if ((active0 & 0x2000000L) != 0L)
- return jjStartNfaWithStates_0(4, 25, 17);
+ return jjStartNfaWithStates_0(4, 25, 20);
break;
default :
break;
@@ -415,7 +415,7 @@
{
int[] nextStates;
int startsAt = 0;
- jjnewStateCnt = 26;
+ jjnewStateCnt = 29;
int i = 1;
jjstateSet[0] = startState;
int j, kind = 0x7fffffff;
@@ -435,7 +435,7 @@
{
if (kind > 48)
kind = 48;
- jjCheckNAdd(16);
+ jjCheckNAdd(19);
}
else if ((0x2400L & l) != 0L)
{
@@ -452,8 +452,10 @@
{
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(23, 24);
+ jjCheckNAddTwoStates(26, 27);
}
+ else if (curChar == 39)
+ jjCheckNAddTwoStates(14, 15);
else if (curChar == 34)
jjCheckNAddTwoStates(11, 12);
else if (curChar == 35)
@@ -465,7 +467,7 @@
jjCheckNAddStates(0, 2);
}
if (curChar == 13)
- jjstateSet[jjnewStateCnt++] = 14;
+ jjstateSet[jjnewStateCnt++] = 17;
break;
case 1:
if ((0x100000200L & l) != 0L)
@@ -519,42 +521,54 @@
kind = 23;
break;
case 13:
+ if (curChar == 39)
+ jjCheckNAddTwoStates(14, 15);
+ break;
+ case 14:
+ if ((0xffffff7fffffdbffL & l) != 0L)
+ jjCheckNAddTwoStates(14, 15);
+ break;
+ case 15:
+ if (curChar == 39 && kind > 23)
+ kind = 23;
+ break;
+ case 16:
if ((0x2400L & l) != 0L && kind > 26)
kind = 26;
break;
- case 14:
+ case 17:
if (curChar == 10 && kind > 26)
kind = 26;
break;
- case 15:
+ case 18:
if (curChar == 13)
- jjstateSet[jjnewStateCnt++] = 14;
+ jjstateSet[jjnewStateCnt++] = 17;
break;
- case 16:
+ case 19:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 48)
kind = 48;
- jjCheckNAdd(16);
+ jjCheckNAdd(19);
break;
- case 20:
+ case 23:
if (curChar == 36 && kind > 9)
kind = 9;
break;
- case 22:
+ case 25:
if (curChar == 36)
- jjCheckNAddTwoStates(23, 24);
+ jjCheckNAddTwoStates(26, 27);
break;
- case 24:
+ case 27:
if (curChar == 33 && kind > 10)
kind = 10;
break;
- case 25:
+ case 28:
if (curChar != 36)
break;
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(23, 24);
+ jjCheckNAddTwoStates(26, 27);
break;
default : break;
}
@@ -572,7 +586,7 @@
{
if (kind > 50)
kind = 50;
- jjCheckNAdd(17);
+ jjCheckNAdd(20);
}
else if (curChar == 92)
jjCheckNAddStates(3, 6);
@@ -584,28 +598,31 @@
case 11:
jjAddStates(7, 8);
break;
- case 17:
+ case 14:
+ jjAddStates(9, 10);
+ break;
+ case 20:
if ((0x7fffffe07fffffeL & l) == 0L)
break;
if (kind > 50)
kind = 50;
- jjCheckNAdd(17);
+ jjCheckNAdd(20);
break;
- case 18:
+ case 21:
if (curChar == 92)
jjCheckNAddStates(3, 6);
break;
- case 19:
+ case 22:
if (curChar == 92)
- jjCheckNAddTwoStates(19, 20);
+ jjCheckNAddTwoStates(22, 23);
break;
- case 21:
+ case 24:
if (curChar == 92)
- jjCheckNAddTwoStates(21, 22);
+ jjCheckNAddTwoStates(24, 25);
break;
- case 23:
+ case 26:
if (curChar == 92)
- jjAddStates(9, 10);
+ jjAddStates(11, 12);
break;
default : break;
}
@@ -627,6 +644,10 @@
if ((jjbitVec0[i2] & l2) != 0L)
jjAddStates(7, 8);
break;
+ case 14:
+ if ((jjbitVec0[i2] & l2) != 0L)
+ jjAddStates(9, 10);
+ break;
default : break;
}
} while(i != startsAt);
@@ -638,7 +659,7 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 26 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 29 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -778,7 +799,7 @@
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(11, 14);
+ jjCheckNAddStates(13, 16);
break;
case 1:
if (kind > 12)
@@ -794,7 +815,7 @@
break;
case 9:
if (curChar == 92)
- jjAddStates(15, 16);
+ jjAddStates(17, 18);
break;
default : break;
}
@@ -1066,7 +1087,7 @@
kind = 45;
}
else if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(17, 19);
+ jjCheckNAddStates(19, 21);
if (curChar == 13)
jjstateSet[jjnewStateCnt++] = 24;
break;
@@ -1126,7 +1147,7 @@
break;
case 16:
if ((0x100000200L & l) != 0L)
- jjAddStates(20, 22);
+ jjAddStates(22, 24);
break;
case 17:
if ((0x2400L & l) != 0L && kind > 42)
@@ -1142,7 +1163,7 @@
break;
case 22:
if ((0x100000200L & l) != 0L)
- jjCheckNAddStates(17, 19);
+ jjCheckNAddStates(19, 21);
break;
case 23:
if ((0x2400L & l) != 0L && kind > 45)
@@ -1208,7 +1229,7 @@
{
if (kind > 45)
kind = 45;
- jjAddStates(17, 19);
+ jjAddStates(19, 21);
}
break;
case 3:
@@ -1219,9 +1240,9 @@
jjCheckNAdd(5);
}
else if (curChar == 92)
- jjCheckNAddStates(23, 26);
+ jjCheckNAddStates(25, 28);
if (curChar == 101)
- jjAddStates(27, 28);
+ jjAddStates(29, 30);
break;
case 1:
if (kind > 12)
@@ -1229,7 +1250,7 @@
break;
case 6:
if (curChar == 92)
- jjCheckNAddStates(23, 26);
+ jjCheckNAddStates(25, 28);
break;
case 7:
if (curChar == 92)
@@ -1245,14 +1266,14 @@
break;
case 14:
if (curChar == 101)
- jjAddStates(27, 28);
+ jjAddStates(29, 30);
break;
case 15:
if (curChar != 100)
break;
if (kind > 42)
kind = 42;
- jjAddStates(20, 22);
+ jjAddStates(22, 24);
break;
case 27:
if (curChar == 108)
@@ -1482,7 +1503,7 @@
break;
case 22:
if (curChar == 92)
- jjAddStates(29, 30);
+ jjAddStates(31, 32);
if (curChar == 92)
jjCheckNAddTwoStates(17, 18);
if (curChar == 92)
@@ -1496,9 +1517,9 @@
jjCheckNAdd(5);
}
else if (curChar == 92)
- jjCheckNAddStates(31, 34);
+ jjCheckNAddStates(33, 36);
if (curChar == 92)
- jjAddStates(29, 30);
+ jjAddStates(31, 32);
break;
case 7:
if (curChar == 92)
@@ -1525,7 +1546,7 @@
break;
case 6:
if (curChar == 92)
- jjAddStates(29, 30);
+ jjAddStates(31, 32);
break;
case 9:
if ((0x7fffffe07fffffeL & l) == 0L)
@@ -1540,7 +1561,7 @@
break;
case 14:
if (curChar == 92)
- jjCheckNAddStates(31, 34);
+ jjCheckNAddStates(33, 36);
break;
case 15:
if (curChar == 92)
@@ -1552,7 +1573,7 @@
break;
case 19:
if (curChar == 92)
- jjAddStates(35, 36);
+ jjAddStates(37, 38);
break;
default : break;
}
@@ -1729,7 +1750,7 @@
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(11, 14);
+ jjCheckNAddStates(13, 16);
break;
case 1:
if (kind > 12)
@@ -1745,7 +1766,7 @@
break;
case 9:
if (curChar == 92)
- jjAddStates(15, 16);
+ jjAddStates(17, 18);
break;
default : break;
}
@@ -1929,7 +1950,7 @@
{
case 3:
if (curChar == 92)
- jjCheckNAddStates(37, 40);
+ jjCheckNAddStates(39, 42);
break;
case 1:
if (kind > 12)
@@ -1945,7 +1966,7 @@
break;
case 12:
if (curChar == 92)
- jjAddStates(41, 42);
+ jjAddStates(43, 44);
break;
default : break;
}
@@ -1985,13 +2006,13 @@
switch (pos)
{
case 0:
- if ((active0 & 0x6800L) != 0L)
- return 2;
if ((active0 & 0x3000000L) != 0L)
{
jjmatchedKind = 54;
- return 8;
+ return 11;
}
+ if ((active0 & 0x6800L) != 0L)
+ return 2;
return -1;
case 1:
if ((active0 & 0x2000L) != 0L)
@@ -2000,7 +2021,7 @@
{
jjmatchedKind = 54;
jjmatchedPos = 1;
- return 8;
+ return 11;
}
return -1;
case 2:
@@ -2008,17 +2029,17 @@
{
jjmatchedKind = 54;
jjmatchedPos = 2;
- return 8;
+ return 11;
}
return -1;
case 3:
if ((active0 & 0x1000000L) != 0L)
- return 8;
+ return 11;
if ((active0 & 0x2000000L) != 0L)
{
jjmatchedKind = 54;
jjmatchedPos = 3;
- return 8;
+ return 11;
}
return -1;
default :
@@ -2115,7 +2136,7 @@
{
case 101:
if ((active0 & 0x1000000L) != 0L)
- return jjStartNfaWithStates_5(3, 24, 8);
+ return jjStartNfaWithStates_5(3, 24, 11);
break;
case 115:
return jjMoveStringLiteralDfa4_5(active0, 0x2000000L);
@@ -2137,7 +2158,7 @@
{
case 101:
if ((active0 & 0x2000000L) != 0L)
- return jjStartNfaWithStates_5(4, 25, 8);
+ return jjStartNfaWithStates_5(4, 25, 11);
break;
default :
break;
@@ -2148,7 +2169,7 @@
{
int[] nextStates;
int startsAt = 0;
- jjnewStateCnt = 19;
+ jjnewStateCnt = 22;
int i = 1;
jjstateSet[0] = startState;
int j, kind = 0x7fffffff;
@@ -2168,10 +2189,12 @@
{
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(16, 17);
+ jjCheckNAddTwoStates(19, 20);
}
else if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 10;
+ jjstateSet[jjnewStateCnt++] = 13;
+ else if (curChar == 39)
+ jjCheckNAddTwoStates(8, 9);
else if (curChar == 34)
jjCheckNAddTwoStates(5, 6);
else if (curChar == 35)
@@ -2201,35 +2224,47 @@
if (curChar == 34 && kind > 23)
kind = 23;
break;
+ case 7:
+ if (curChar == 39)
+ jjCheckNAddTwoStates(8, 9);
+ break;
case 8:
+ if ((0xffffff7fffffdbffL & l) != 0L)
+ jjCheckNAddTwoStates(8, 9);
+ break;
+ case 9:
+ if (curChar == 39 && kind > 23)
+ kind = 23;
+ break;
+ case 11:
if ((0x3ff200000000000L & l) == 0L)
break;
if (kind > 54)
kind = 54;
- jjstateSet[jjnewStateCnt++] = 8;
+ jjstateSet[jjnewStateCnt++] = 11;
break;
- case 9:
+ case 12:
if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 10;
+ jjstateSet[jjnewStateCnt++] = 13;
break;
- case 13:
+ case 16:
if (curChar == 36 && kind > 9)
kind = 9;
break;
- case 15:
+ case 18:
if (curChar == 36)
- jjCheckNAddTwoStates(16, 17);
+ jjCheckNAddTwoStates(19, 20);
break;
- case 17:
+ case 20:
if (curChar == 33 && kind > 10)
kind = 10;
break;
- case 18:
+ case 21:
if (curChar != 36)
break;
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(16, 17);
+ jjCheckNAddTwoStates(19, 20);
break;
default : break;
}
@@ -2247,45 +2282,48 @@
{
if (kind > 54)
kind = 54;
- jjCheckNAdd(8);
+ jjCheckNAdd(11);
}
else if (curChar == 92)
- jjCheckNAddStates(43, 46);
+ jjCheckNAddStates(33, 36);
break;
case 1:
if (kind > 12)
kind = 12;
break;
case 5:
- jjAddStates(47, 48);
+ jjAddStates(45, 46);
break;
- case 7:
case 8:
+ jjAddStates(47, 48);
+ break;
+ case 10:
+ case 11:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 54)
kind = 54;
- jjCheckNAdd(8);
+ jjCheckNAdd(11);
break;
- case 10:
+ case 13:
if ((0x7fffffe07fffffeL & l) != 0L && kind > 55)
kind = 55;
break;
- case 11:
+ case 14:
if (curChar == 92)
- jjCheckNAddStates(43, 46);
+ jjCheckNAddStates(33, 36);
break;
- case 12:
+ case 15:
if (curChar == 92)
- jjCheckNAddTwoStates(12, 13);
+ jjCheckNAddTwoStates(15, 16);
break;
- case 14:
+ case 17:
if (curChar == 92)
- jjCheckNAddTwoStates(14, 15);
+ jjCheckNAddTwoStates(17, 18);
break;
- case 16:
+ case 19:
if (curChar == 92)
- jjAddStates(49, 50);
+ jjAddStates(37, 38);
break;
default : break;
}
@@ -2305,6 +2343,10 @@
break;
case 5:
if ((jjbitVec0[i2] & l2) != 0L)
+ jjAddStates(45, 46);
+ break;
+ case 8:
+ if ((jjbitVec0[i2] & l2) != 0L)
jjAddStates(47, 48);
break;
default : break;
@@ -2318,7 +2360,7 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 19 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 22 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -2334,7 +2376,7 @@
if ((active0 & 0x3000000L) != 0L)
{
jjmatchedKind = 54;
- return 10;
+ return 13;
}
return -1;
case 1:
@@ -2344,7 +2386,7 @@
{
jjmatchedKind = 54;
jjmatchedPos = 1;
- return 10;
+ return 13;
}
return -1;
case 2:
@@ -2352,18 +2394,18 @@
{
jjmatchedKind = 54;
jjmatchedPos = 2;
- return 10;
+ return 13;
}
return -1;
case 3:
- if ((active0 & 0x1000000L) != 0L)
- return 10;
if ((active0 & 0x2000000L) != 0L)
{
jjmatchedKind = 54;
jjmatchedPos = 3;
- return 10;
+ return 13;
}
+ if ((active0 & 0x1000000L) != 0L)
+ return 13;
return -1;
default :
return -1;
@@ -2467,7 +2509,7 @@
{
case 101:
if ((active0 & 0x1000000L) != 0L)
- return jjStartNfaWithStates_2(3, 24, 10);
+ return jjStartNfaWithStates_2(3, 24, 13);
break;
case 115:
return jjMoveStringLiteralDfa4_2(active0, 0x2000000L);
@@ -2489,7 +2531,7 @@
{
case 101:
if ((active0 & 0x2000000L) != 0L)
- return jjStartNfaWithStates_2(4, 25, 10);
+ return jjStartNfaWithStates_2(4, 25, 13);
break;
default :
break;
@@ -2500,7 +2542,7 @@
{
int[] nextStates;
int startsAt = 0;
- jjnewStateCnt = 21;
+ jjnewStateCnt = 24;
int i = 1;
jjstateSet[0] = startState;
int j, kind = 0x7fffffff;
@@ -2520,7 +2562,7 @@
{
if (kind > 48)
kind = 48;
- jjCheckNAdd(8);
+ jjCheckNAdd(11);
}
else if ((0x100000200L & l) != 0L)
{
@@ -2532,10 +2574,12 @@
{
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(18, 19);
+ jjCheckNAddTwoStates(21, 22);
}
else if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 12;
+ jjstateSet[jjnewStateCnt++] = 15;
+ else if (curChar == 39)
+ jjCheckNAddTwoStates(9, 10);
else if (curChar == 34)
jjCheckNAddTwoStates(6, 7);
else if (curChar == 35)
@@ -2573,41 +2617,53 @@
kind = 23;
break;
case 8:
+ if (curChar == 39)
+ jjCheckNAddTwoStates(9, 10);
+ break;
+ case 9:
+ if ((0xffffff7fffffdbffL & l) != 0L)
+ jjCheckNAddTwoStates(9, 10);
+ break;
+ case 10:
+ if (curChar == 39 && kind > 23)
+ kind = 23;
+ break;
+ case 11:
if ((0x3ff000000000000L & l) == 0L)
break;
if (kind > 48)
kind = 48;
- jjCheckNAdd(8);
+ jjCheckNAdd(11);
break;
- case 10:
+ case 13:
if ((0x3ff200000000000L & l) == 0L)
break;
if (kind > 54)
kind = 54;
- jjstateSet[jjnewStateCnt++] = 10;
+ jjstateSet[jjnewStateCnt++] = 13;
break;
- case 11:
+ case 14:
if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 12;
+ jjstateSet[jjnewStateCnt++] = 15;
break;
- case 15:
+ case 18:
if (curChar == 36 && kind > 9)
kind = 9;
break;
- case 17:
+ case 20:
if (curChar == 36)
- jjCheckNAddTwoStates(18, 19);
+ jjCheckNAddTwoStates(21, 22);
break;
- case 19:
+ case 22:
if (curChar == 33 && kind > 10)
kind = 10;
break;
- case 20:
+ case 23:
if (curChar != 36)
break;
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(18, 19);
+ jjCheckNAddTwoStates(21, 22);
break;
default : break;
}
@@ -2625,45 +2681,48 @@
{
if (kind > 54)
kind = 54;
- jjCheckNAdd(10);
+ jjCheckNAdd(13);
}
else if (curChar == 92)
- jjCheckNAddStates(51, 54);
+ jjCheckNAddStates(49, 52);
break;
case 1:
if (kind > 12)
kind = 12;
break;
case 6:
- jjAddStates(55, 56);
+ jjAddStates(53, 54);
break;
case 9:
- case 10:
+ jjAddStates(17, 18);
+ break;
+ case 12:
+ case 13:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 54)
kind = 54;
- jjCheckNAdd(10);
+ jjCheckNAdd(13);
break;
- case 12:
+ case 15:
if ((0x7fffffe07fffffeL & l) != 0L && kind > 55)
kind = 55;
break;
- case 13:
+ case 16:
if (curChar == 92)
- jjCheckNAddStates(51, 54);
+ jjCheckNAddStates(49, 52);
break;
- case 14:
+ case 17:
if (curChar == 92)
- jjCheckNAddTwoStates(14, 15);
+ jjCheckNAddTwoStates(17, 18);
break;
- case 16:
+ case 19:
if (curChar == 92)
- jjCheckNAddTwoStates(16, 17);
+ jjCheckNAddTwoStates(19, 20);
break;
- case 18:
+ case 21:
if (curChar == 92)
- jjAddStates(57, 58);
+ jjAddStates(55, 56);
break;
default : break;
}
@@ -2683,8 +2742,12 @@
break;
case 6:
if ((jjbitVec0[i2] & l2) != 0L)
- jjAddStates(55, 56);
+ jjAddStates(53, 54);
break;
+ case 9:
+ if ((jjbitVec0[i2] & l2) != 0L)
+ jjAddStates(17, 18);
+ break;
default : break;
}
} while(i != startsAt);
@@ -2696,7 +2759,7 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 21 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 24 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
@@ -2707,13 +2770,13 @@
switch (pos)
{
case 0:
- if ((active0 & 0x6800L) != 0L)
- return 2;
if ((active0 & 0x3000000L) != 0L)
{
jjmatchedKind = 54;
- return 8;
+ return 11;
}
+ if ((active0 & 0x6800L) != 0L)
+ return 2;
return -1;
case 1:
if ((active0 & 0x2000L) != 0L)
@@ -2722,7 +2785,7 @@
{
jjmatchedKind = 54;
jjmatchedPos = 1;
- return 8;
+ return 11;
}
return -1;
case 2:
@@ -2730,17 +2793,17 @@
{
jjmatchedKind = 54;
jjmatchedPos = 2;
- return 8;
+ return 11;
}
return -1;
case 3:
if ((active0 & 0x1000000L) != 0L)
- return 8;
+ return 11;
if ((active0 & 0x2000000L) != 0L)
{
jjmatchedKind = 54;
jjmatchedPos = 3;
- return 8;
+ return 11;
}
return -1;
default :
@@ -2843,7 +2906,7 @@
{
case 101:
if ((active0 & 0x1000000L) != 0L)
- return jjStartNfaWithStates_1(3, 24, 8);
+ return jjStartNfaWithStates_1(3, 24, 11);
break;
case 115:
return jjMoveStringLiteralDfa4_1(active0, 0x2000000L);
@@ -2865,7 +2928,7 @@
{
case 101:
if ((active0 & 0x2000000L) != 0L)
- return jjStartNfaWithStates_1(4, 25, 8);
+ return jjStartNfaWithStates_1(4, 25, 11);
break;
default :
break;
@@ -2876,7 +2939,7 @@
{
int[] nextStates;
int startsAt = 0;
- jjnewStateCnt = 19;
+ jjnewStateCnt = 22;
int i = 1;
jjstateSet[0] = startState;
int j, kind = 0x7fffffff;
@@ -2896,10 +2959,12 @@
{
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(16, 17);
+ jjCheckNAddTwoStates(19, 20);
}
else if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 10;
+ jjstateSet[jjnewStateCnt++] = 13;
+ else if (curChar == 39)
+ jjCheckNAddTwoStates(8, 9);
else if (curChar == 34)
jjCheckNAddTwoStates(5, 6);
else if (curChar == 35)
@@ -2929,35 +2994,47 @@
if (curChar == 34 && kind > 23)
kind = 23;
break;
+ case 7:
+ if (curChar == 39)
+ jjCheckNAddTwoStates(8, 9);
+ break;
case 8:
+ if ((0xffffff7fffffdbffL & l) != 0L)
+ jjCheckNAddTwoStates(8, 9);
+ break;
+ case 9:
+ if (curChar == 39 && kind > 23)
+ kind = 23;
+ break;
+ case 11:
if ((0x3ff200000000000L & l) == 0L)
break;
if (kind > 54)
kind = 54;
- jjstateSet[jjnewStateCnt++] = 8;
+ jjstateSet[jjnewStateCnt++] = 11;
break;
- case 9:
+ case 12:
if (curChar == 46)
- jjstateSet[jjnewStateCnt++] = 10;
+ jjstateSet[jjnewStateCnt++] = 13;
break;
- case 13:
+ case 16:
if (curChar == 36 && kind > 9)
kind = 9;
break;
- case 15:
+ case 18:
if (curChar == 36)
- jjCheckNAddTwoStates(16, 17);
+ jjCheckNAddTwoStates(19, 20);
break;
- case 17:
+ case 20:
if (curChar == 33 && kind > 10)
kind = 10;
break;
- case 18:
+ case 21:
if (curChar != 36)
break;
if (kind > 9)
kind = 9;
- jjCheckNAddTwoStates(16, 17);
+ jjCheckNAddTwoStates(19, 20);
break;
default : break;
}
@@ -2975,45 +3052,48 @@
{
if (kind > 54)
kind = 54;
- jjCheckNAdd(8);
+ jjCheckNAdd(11);
}
else if (curChar == 92)
- jjCheckNAddStates(43, 46);
+ jjCheckNAddStates(33, 36);
break;
case 1:
if (kind > 12)
kind = 12;
break;
case 5:
- jjAddStates(47, 48);
+ jjAddStates(45, 46);
break;
- case 7:
case 8:
+ jjAddStates(47, 48);
+ break;
+ case 10:
+ case 11:
if ((0x7fffffe87fffffeL & l) == 0L)
break;
if (kind > 54)
kind = 54;
- jjCheckNAdd(8);
+ jjCheckNAdd(11);
break;
- case 10:
+ case 13:
if ((0x7fffffe07fffffeL & l) != 0L && kind > 55)
kind = 55;
break;
- case 11:
+ case 14:
if (curChar == 92)
- jjCheckNAddStates(43, 46);
+ jjCheckNAddStates(33, 36);
break;
- case 12:
+ case 15:
if (curChar == 92)
- jjCheckNAddTwoStates(12, 13);
+ jjCheckNAddTwoStates(15, 16);
break;
- case 14:
+ case 17:
if (curChar == 92)
- jjCheckNAddTwoStates(14, 15);
+ jjCheckNAddTwoStates(17, 18);
break;
- case 16:
+ case 19:
if (curChar == 92)
- jjAddStates(49, 50);
+ jjAddStates(37, 38);
break;
default : break;
}
@@ -3033,6 +3113,10 @@
break;
case 5:
if ((jjbitVec0[i2] & l2) != 0L)
+ jjAddStates(45, 46);
+ break;
+ case 8:
+ if ((jjbitVec0[i2] & l2) != 0L)
jjAddStates(47, 48);
break;
default : break;
@@ -3046,17 +3130,17 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 19 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 22 - (jjnewStateCnt = startsAt)))
return curPos;
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
}
}
static final int[] jjnextStates = {
- 1, 2, 4, 19, 20, 21, 22, 11, 12, 23, 24, 5, 6, 7, 8, 9,
- 10, 22, 23, 25, 16, 17, 19, 7, 8, 9, 10, 20, 27, 7, 8, 15,
- 16, 17, 18, 19, 20, 8, 9, 10, 11, 12, 13, 12, 13, 14, 15, 5,
- 6, 16, 17, 14, 15, 16, 17, 6, 7, 18, 19,
+ 1, 2, 4, 22, 23, 24, 25, 11, 12, 14, 15, 26, 27, 5, 6, 7,
+ 8, 9, 10, 22, 23, 25, 16, 17, 19, 7, 8, 9, 10, 20, 27, 7,
+ 8, 15, 16, 17, 18, 19, 20, 8, 9, 10, 11, 12, 13, 5, 6, 8,
+ 9, 17, 18, 19, 20, 6, 7, 21, 22,
};
public static final String[] jjstrLiteralImages = {
null, null, null, null, null, null, null, null, null, null, null, null, null,
@@ -3093,8 +3177,8 @@
0x207e00L,
};
private ASCII_CharStream input_stream;
-private final int[] jjrounds = new int[28];
-private final int[] jjstateSet = new int[56];
+private final int[] jjrounds = new int[29];
+private final int[] jjstateSet = new int[58];
StringBuffer image;
int jjimageLen;
int lengthOfMatch;
@@ -3121,7 +3205,7 @@
{
int i;
jjround = 0x80000001;
- for (i = 28; i-- > 0;)
+ for (i = 29; i-- > 0;)
jjrounds[i] = 0x80000000;
}
public void ReInit(ASCII_CharStream stream, int lexState)
