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 e8a8a8e..464bc79 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -52,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) { @@ -305,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) { @@ -434,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) { @@ -452,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: @@ -492,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); @@ -563,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); } @@ -571,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) @@ -609,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) @@ -634,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); @@ -647,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); @@ -706,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) @@ -724,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); @@ -802,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) @@ -839,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) @@ -854,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) @@ -869,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) @@ -958,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) @@ -1026,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) @@ -1084,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) @@ -1114,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) @@ -1133,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) @@ -1152,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) @@ -1171,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) @@ -1194,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 @@ -1306,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: @@ -1465,7 +1472,7 @@ 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; @@ -1492,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; @@ -1500,10 +1507,10 @@ 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: @@ -1605,10 +1612,26 @@ 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(33, 35); @@ -1695,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", @@ -1710,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,