X-Git-Url: http://git.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 18f0cf2..464bc79 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -14,6 +14,8 @@ import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; import net.sourceforge.phpdt.internal.compiler.parser.PHPSegmentWithChildren; import net.sourceforge.phpdt.internal.compiler.parser.PHPFunctionDeclaration; import net.sourceforge.phpdt.internal.compiler.parser.PHPClassDeclaration; +import net.sourceforge.phpdt.internal.compiler.parser.PHPVarDeclaration; +import net.sourceforge.phpdt.internal.compiler.parser.PHPReqIncDeclaration; public class PHPParserTokenManager implements PHPParserConstants { @@ -50,28 +52,28 @@ static private final int jjMoveStringLiteralDfa0_0() switch(curChar) { case 63: - return jjMoveStringLiteralDfa1_0(0x8000000000000000L); + return jjMoveStringLiteralDfa1_0(0x2L); default : return jjMoveNfa_0(0, 0); } } -static private final int jjMoveStringLiteralDfa1_0(long active1) +static private final int jjMoveStringLiteralDfa1_0(long active2) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_0(0, 0L, active1, 0L); + jjStopStringLiteralDfa_0(0, 0L, 0L, active2); return 1; } switch(curChar) { case 62: - if ((active1 & 0x8000000000000000L) != 0L) - return jjStopAtPos(1, 127); + if ((active2 & 0x2L) != 0L) + return jjStopAtPos(1, 129); break; default : break; } - return jjStartNfa_0(0, 0L, active1, 0L); + return jjStartNfa_0(0, 0L, 0L, active2); } static private final void jjCheckNAdd(int state) { @@ -303,7 +305,7 @@ static private final int jjMoveNfa_2(int startState, int curPos) catch(java.io.IOException e) { return curPos; } } } -private static final int jjStopStringLiteralDfa_1(int pos, long active0, long active1) +private static final int jjStopStringLiteralDfa_1(int pos, long active0, long active1, long active2) { switch (pos) { @@ -432,9 +434,9 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac return -1; } } -private static final int jjStartNfa_1(int pos, long active0, long active1) +private static final int jjStartNfa_1(int pos, long active0, long active1, long active2) { - return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1), pos + 1); + return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0, active1, active2), pos + 1); } static private final int jjStartNfaWithStates_1(int pos, int kind, int state) { @@ -450,7 +452,7 @@ static private final int jjMoveStringLiteralDfa0_1() { case 33: jjmatchedKind = 92; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000400000000L); case 36: return jjStartNfaWithStates_1(0, 88, 16); case 37: @@ -490,10 +492,10 @@ static private final int jjMoveStringLiteralDfa0_1() return jjMoveStringLiteralDfa1_1(0x0L, 0x800800100000000L); case 61: jjmatchedKind = 89; - return jjMoveStringLiteralDfa1_1(0x200000000L, 0x80000000L); + return jjMoveStringLiteralDfa1_1(0x200000000L, 0x4000000080000000L); case 62: jjmatchedKind = 90; - return jjMoveStringLiteralDfa1_1(0x0L, 0x3003000200000000L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x1003000200000000L); case 63: jjmatchedKind = 93; return jjMoveStringLiteralDfa1_1(0x4L, 0x0L); @@ -561,6 +563,8 @@ static private final int jjMoveStringLiteralDfa0_1() return jjMoveStringLiteralDfa1_1(0x0L, 0x80000800000000L); case 125: return jjStopAtPos(0, 81); + case 126: + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000000L); default : return jjMoveNfa_1(3, 0); } @@ -569,7 +573,7 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(0, active0, active1); + jjStopStringLiteralDfa_1(0, active0, active1, 0L); return 1; } switch(curChar) @@ -607,13 +611,19 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1) return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000000000L); case 61: if ((active1 & 0x80000000L) != 0L) - return jjStopAtPos(1, 95); + { + jjmatchedKind = 95; + jjmatchedPos = 1; + } else if ((active1 & 0x100000000L) != 0L) return jjStopAtPos(1, 96); else if ((active1 & 0x200000000L) != 0L) return jjStopAtPos(1, 97); else if ((active1 & 0x400000000L) != 0L) - return jjStopAtPos(1, 98); + { + jjmatchedKind = 98; + jjmatchedPos = 1; + } else if ((active1 & 0x4000000000000L) != 0L) return jjStopAtPos(1, 114); else if ((active1 & 0x8000000000000L) != 0L) @@ -632,7 +642,9 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1) return jjStopAtPos(1, 121); else if ((active1 & 0x400000000000000L) != 0L) return jjStopAtPos(1, 122); - break; + else if ((active1 & 0x8000000000000000L) != 0L) + return jjStopAtPos(1, 127); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000000000L); case 62: if ((active0 & 0x4L) != 0L) return jjStopAtPos(1, 2); @@ -645,7 +657,7 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1) jjmatchedKind = 112; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x3002000000000000L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1002000000000000L); case 65: case 97: return jjMoveStringLiteralDfa2_1(active0, 0x20800040000L, active1, 0L); @@ -704,15 +716,15 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1) default : break; } - return jjStartNfa_1(0, active0, active1); + return jjStartNfa_1(0, active0, active1, 0L); } static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long old1, long active1) { if (((active0 &= old0) | (active1 &= old1)) == 0L) - return jjStartNfa_1(0, old0, old1); + return jjStartNfa_1(0, old0, old1, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(1, active0, active1); + jjStopStringLiteralDfa_1(1, active0, active1, 0L); return 2; } switch(curChar) @@ -722,14 +734,15 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long return jjStopAtPos(2, 123); else if ((active1 & 0x1000000000000000L) != 0L) return jjStopAtPos(2, 124); + else if ((active1 & 0x2000000000000000L) != 0L) + return jjStopAtPos(2, 125); + else if ((active1 & 0x4000000000000000L) != 0L) + return jjStopAtPos(2, 126); break; case 62: if ((active1 & 0x2000000000000L) != 0L) - { - jjmatchedKind = 113; - jjmatchedPos = 2; - } - return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x2000000000000000L); + return jjStopAtPos(2, 113); + break; case 65: case 97: return jjMoveStringLiteralDfa3_1(active0, 0x200000040010000L, active1, 0L); @@ -800,32 +813,28 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long default : break; } - return jjStartNfa_1(1, active0, active1); + return jjStartNfa_1(1, active0, active1, 0L); } static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long old1, long active1) { if (((active0 &= old0) | (active1 &= old1)) == 0L) - return jjStartNfa_1(1, old0, old1); + return jjStartNfa_1(1, old0, old1, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(2, active0, active1); + jjStopStringLiteralDfa_1(2, active0, 0L, 0L); return 3; } switch(curChar) { - case 61: - if ((active1 & 0x2000000000000000L) != 0L) - return jjStopAtPos(3, 125); - break; case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x800004400400000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x800004400400000L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x400000020000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400000020000000L); case 67: case 99: - return jjMoveStringLiteralDfa4_1(active0, 0x20000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x20000L); case 69: case 101: if ((active0 & 0x200000L) != 0L) @@ -837,10 +846,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long return jjStartNfaWithStates_1(3, 35, 14); else if ((active0 & 0x4000000000000L) != 0L) return jjStartNfaWithStates_1(3, 50, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x2040810000100000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x2040810000100000L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L); case 76: case 108: if ((active0 & 0x200000000000L) != 0L) @@ -852,10 +861,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long } else if ((active0 & 0x200000000000000L) != 0L) return jjStartNfaWithStates_1(3, 57, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x10800000a000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x10800000a000000L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x800000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x800000L); case 79: case 111: if ((active0 & 0x1000000L) != 0L) @@ -867,28 +876,28 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long case 115: if ((active0 & 0x2000000000000L) != 0L) return jjStartNfaWithStates_1(3, 49, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x21000010000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x21000010000L); case 84: case 116: - return jjMoveStringLiteralDfa4_1(active0, 0x1002040000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1002040000000L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x400014000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400014000000L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x10000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x10000000000000L); default : break; } - return jjStartNfa_1(2, active0, active1); + return jjStartNfa_1(2, active0, 0L, 0L); } -static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long old1, long active1) +static private final int jjMoveStringLiteralDfa4_1(long old0, long active0) { - if (((active0 &= old0) | (active1 &= old1)) == 0L) - return jjStartNfa_1(2, old0, old1); + if (((active0 &= old0)) == 0L) + return jjStartNfa_1(2, old0, 0L, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(3, active0, 0L); + jjStopStringLiteralDfa_1(3, active0, 0L, 0L); return 4; } switch(curChar) @@ -956,15 +965,15 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long default : break; } - return jjStartNfa_1(3, active0, 0L); + return jjStartNfa_1(3, active0, 0L, 0L); } static private final int jjMoveStringLiteralDfa5_1(long old0, long active0) { if (((active0 &= old0)) == 0L) - return jjStartNfa_1(3, old0, 0L); + return jjStartNfa_1(3, old0, 0L, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(4, active0, 0L); + jjStopStringLiteralDfa_1(4, active0, 0L, 0L); return 5; } switch(curChar) @@ -1024,15 +1033,15 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0) default : break; } - return jjStartNfa_1(4, active0, 0L); + return jjStartNfa_1(4, active0, 0L, 0L); } static private final int jjMoveStringLiteralDfa6_1(long old0, long active0) { if (((active0 &= old0)) == 0L) - return jjStartNfa_1(4, old0, 0L); + return jjStartNfa_1(4, old0, 0L, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(5, active0, 0L); + jjStopStringLiteralDfa_1(5, active0, 0L, 0L); return 6; } switch(curChar) @@ -1082,15 +1091,15 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0) default : break; } - return jjStartNfa_1(5, active0, 0L); + return jjStartNfa_1(5, active0, 0L, 0L); } static private final int jjMoveStringLiteralDfa7_1(long old0, long active0) { if (((active0 &= old0)) == 0L) - return jjStartNfa_1(5, old0, 0L); + return jjStartNfa_1(5, old0, 0L, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(6, active0, 0L); + jjStopStringLiteralDfa_1(6, active0, 0L, 0L); return 7; } switch(curChar) @@ -1112,15 +1121,15 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0) default : break; } - return jjStartNfa_1(6, active0, 0L); + return jjStartNfa_1(6, active0, 0L, 0L); } static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) { if (((active0 &= old0)) == 0L) - return jjStartNfa_1(6, old0, 0L); + return jjStartNfa_1(6, old0, 0L, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(7, active0, 0L); + jjStopStringLiteralDfa_1(7, active0, 0L, 0L); return 8; } switch(curChar) @@ -1131,15 +1140,15 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) default : break; } - return jjStartNfa_1(7, active0, 0L); + return jjStartNfa_1(7, active0, 0L, 0L); } static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) { if (((active0 &= old0)) == 0L) - return jjStartNfa_1(7, old0, 0L); + return jjStartNfa_1(7, old0, 0L, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(8, active0, 0L); + jjStopStringLiteralDfa_1(8, active0, 0L, 0L); return 9; } switch(curChar) @@ -1150,15 +1159,15 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) default : break; } - return jjStartNfa_1(8, active0, 0L); + return jjStartNfa_1(8, active0, 0L, 0L); } static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) { if (((active0 &= old0)) == 0L) - return jjStartNfa_1(8, old0, 0L); + return jjStartNfa_1(8, old0, 0L, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(9, active0, 0L); + jjStopStringLiteralDfa_1(9, active0, 0L, 0L); return 10; } switch(curChar) @@ -1169,15 +1178,15 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) default : break; } - return jjStartNfa_1(9, active0, 0L); + return jjStartNfa_1(9, active0, 0L, 0L); } static private final int jjMoveStringLiteralDfa11_1(long old0, long active0) { if (((active0 &= old0)) == 0L) - return jjStartNfa_1(9, old0, 0L); + return jjStartNfa_1(9, old0, 0L, 0L); try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { - jjStopStringLiteralDfa_1(10, active0, 0L); + jjStopStringLiteralDfa_1(10, active0, 0L, 0L); return 11; } switch(curChar) @@ -1192,7 +1201,7 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0) default : break; } - return jjStartNfa_1(10, active0, 0L); + return jjStartNfa_1(10, active0, 0L, 0L); } static final long[] jjbitVec0 = { 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL @@ -1201,7 +1210,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 56; + jjnewStateCnt = 64; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1220,9 +1229,9 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(2, 8); else if (curChar == 39) - jjCheckNAddStates(9, 12); + jjCheckNAddStates(9, 14); else if (curChar == 34) - jjCheckNAddStates(13, 18); + jjCheckNAddStates(15, 20); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1239,7 +1248,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { if (kind > 64) kind = 64; - jjCheckNAddStates(19, 21); + jjCheckNAddStates(21, 23); } break; case 0: @@ -1277,7 +1286,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 68) kind = 68; - jjCheckNAddStates(22, 24); + jjCheckNAddStates(24, 26); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1304,8 +1313,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 126) - kind = 126; + if (kind > 128) + kind = 128; jjstateSet[jjnewStateCnt++] = 17; break; case 18: @@ -1321,14 +1330,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 68) kind = 68; - jjCheckNAddStates(25, 27); + jjCheckNAddStates(27, 29); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 68) kind = 68; - jjCheckNAddStates(25, 27); + jjCheckNAddStates(27, 29); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1358,7 +1367,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(28, 30); + jjCheckNAddStates(30, 32); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1373,7 +1382,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 64) kind = 64; - jjCheckNAddStates(19, 21); + jjCheckNAddStates(21, 23); break; case 35: if ((0x3ff000000000000L & l) == 0L) @@ -1391,15 +1400,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 37: if (curChar == 34) - jjCheckNAddStates(13, 18); + jjCheckNAddStates(15, 20); break; case 38: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(31, 33); + jjCheckNAddStates(33, 35); break; case 39: if (curChar == 34) - jjCheckNAddStates(31, 33); + jjCheckNAddStates(33, 35); break; case 41: if (curChar == 34 && kind > 70) @@ -1407,11 +1416,11 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(34, 36); + jjCheckNAddStates(36, 38); break; case 43: if (curChar == 34) - jjCheckNAddStates(34, 36); + jjCheckNAddStates(36, 38); break; case 45: if (curChar == 34 && kind > 71) @@ -1419,29 +1428,37 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 46: if (curChar == 39) - jjCheckNAddStates(9, 12); + jjCheckNAddStates(9, 14); break; case 47: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddTwoStates(47, 48); + jjCheckNAddStates(39, 41); break; case 48: + if (curChar == 39) + jjCheckNAddStates(39, 41); + break; + case 50: if (curChar == 39 && kind > 70) kind = 70; break; - case 49: + case 51: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddTwoStates(49, 50); + jjCheckNAddStates(42, 44); break; - case 50: + case 52: + if (curChar == 39) + jjCheckNAddStates(42, 44); + break; + case 54: if (curChar == 39 && kind > 72) kind = 72; break; - case 52: - jjAddStates(37, 38); + case 56: + jjAddStates(45, 47); break; - case 54: - jjAddStates(39, 40); + case 60: + jjAddStates(48, 50); break; default : break; } @@ -1455,14 +1472,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) switch(jjstateSet[--i]) { case 3: - if ((0x7fffffe87fffffeL & l) != 0L) + if ((0x87fffffe87fffffeL & l) != 0L) { if (kind > 74) kind = 74; jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(41, 44); + jjCheckNAddStates(51, 56); break; case 1: if (kind > 10) @@ -1474,7 +1491,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(45, 46); + jjAddStates(57, 58); break; case 12: if ((0x5000000050L & l) != 0L && kind > 68) @@ -1482,7 +1499,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 13: case 14: - if ((0x7fffffe87fffffeL & l) == 0L) + if ((0x87fffffe87fffffeL & l) == 0L) break; if (kind > 74) kind = 74; @@ -1490,23 +1507,23 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 16: case 17: - if ((0x7fffffe87fffffeL & l) == 0L) + if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 126) - kind = 126; + if (kind > 128) + kind = 128; jjCheckNAdd(17); break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(47, 48); + jjAddStates(59, 60); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(49, 50); + jjAddStates(61, 62); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(51, 52); + jjAddStates(63, 64); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1520,42 +1537,66 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(31, 33); + jjAddStates(33, 35); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; case 42: - jjAddStates(34, 36); + jjAddStates(36, 38); break; case 44: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 43; break; case 47: - jjAddStates(53, 54); + jjAddStates(39, 41); break; case 49: - jjAddStates(55, 56); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 48; break; case 51: + jjAddStates(42, 44); + break; + case 53: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 52; + break; + case 55: if (curChar == 96) - jjCheckNAddStates(41, 44); + jjCheckNAddStates(51, 56); break; - case 52: + case 56: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddTwoStates(52, 53); + jjCheckNAddStates(45, 47); break; - case 53: + case 57: + if (curChar == 96) + jjCheckNAddStates(45, 47); + break; + case 58: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 57; + break; + case 59: if (curChar == 96 && kind > 70) kind = 70; break; - case 54: + case 60: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddTwoStates(54, 55); + jjCheckNAddStates(48, 50); break; - case 55: + case 61: + if (curChar == 96) + jjCheckNAddStates(48, 50); + break; + case 62: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 61; + break; + case 63: if (curChar == 96 && kind > 73) kind = 73; break; @@ -1571,33 +1612,49 @@ static private final int jjMoveNfa_1(int startState, int curPos) { switch(jjstateSet[--i]) { + case 3: + case 14: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 74) + kind = 74; + jjCheckNAdd(14); + break; case 1: if ((jjbitVec0[i2] & l2) != 0L && kind > 10) kind = 10; break; + case 16: + case 17: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 128) + kind = 128; + jjCheckNAdd(17); + break; case 38: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(31, 33); + jjAddStates(33, 35); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(34, 36); + jjAddStates(36, 38); break; case 47: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(53, 54); + jjAddStates(39, 41); break; - case 49: + case 51: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(55, 56); + jjAddStates(42, 44); break; - case 52: + case 56: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 38); + jjAddStates(45, 47); break; - case 54: + case 60: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(39, 40); + jjAddStates(48, 50); break; default : break; } @@ -1610,7 +1667,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 56 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -1644,10 +1701,11 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) return 2; } static final int[] jjnextStates = { - 4, 5, 19, 20, 25, 26, 29, 30, 12, 47, 48, 49, 50, 38, 40, 41, - 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, - 40, 41, 42, 44, 45, 52, 53, 54, 55, 52, 53, 54, 55, 10, 11, 23, - 24, 27, 28, 31, 32, 47, 48, 49, 50, + 4, 5, 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, + 40, 41, 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, + 12, 38, 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, + 60, 62, 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, + 32, }; public static final String[] jjstrLiteralImages = { "", null, "\77\76", null, null, null, null, null, null, null, null, null, null, @@ -1660,8 +1718,8 @@ null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", "\74", "\41", "\77", "\72", "\75\75", "\74\75", "\76\75", "\41\75", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", "\53\75", "\55\75", "\52\75", "\57\75", "\46\75", -"\174\75", "\136\75", "\56\75", "\45\75", "\74\74\75", "\76\76\75", "\76\76\76\75", null, -"\77\76", }; +"\174\75", "\136\75", "\56\75", "\45\75", "\74\74\75", "\76\76\75", "\41\75\75", +"\75\75\75", "\176\75", null, "\77\76", }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", @@ -1675,10 +1733,10 @@ public static final int[] jjnewLexState = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, + -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xffffffffffff0007L, 0xffffffffffffc7d1L, 0x0L, + 0xffffffffffff0007L, 0xffffffffffffc7d1L, 0x3L, }; static final long[] jjtoSkip = { 0x71f8L, 0x0L, 0x0L, @@ -1689,9 +1747,9 @@ static final long[] jjtoSpecial = { static final long[] jjtoMore = { 0x8e00L, 0x0L, 0x0L, }; -static private SimpleCharStream input_stream; -static private final int[] jjrounds = new int[56]; -static private final int[] jjstateSet = new int[112]; +static protected SimpleCharStream input_stream; +static private final int[] jjrounds = new int[64]; +static private final int[] jjstateSet = new int[128]; static StringBuffer image; static int jjimageLen; static int lengthOfMatch; @@ -1718,7 +1776,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 56; i-- > 0;) + for (i = 64; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState) @@ -1734,7 +1792,7 @@ static public void SwitchTo(int lexState) curLexState = lexState; } -static private final Token jjFillToken() +static protected Token jjFillToken() { Token t = Token.newToken(jjmatchedKind); t.kind = jjmatchedKind; @@ -1754,7 +1812,7 @@ static int jjround; static int jjmatchedPos; static int jjmatchedKind; -public static final Token getNextToken() +public static Token getNextToken() { int kind; Token specialToken = null; @@ -1896,7 +1954,7 @@ public static final Token getNextToken() } } -static final void SkipLexicalActions(Token matchedToken) +static void SkipLexicalActions(Token matchedToken) { switch(jjmatchedKind) { @@ -1904,7 +1962,7 @@ static final void SkipLexicalActions(Token matchedToken) break; } } -static final void MoreLexicalActions() +static void MoreLexicalActions() { jjimageLen += (lengthOfMatch = jjmatchedPos + 1); switch(jjmatchedKind)