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 016518a..be6ded1 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -1253,7 +1253,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 70; + jjnewStateCnt = 64; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1274,7 +1274,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) else if (curChar == 39) jjCheckNAddStates(7, 12); else if (curChar == 34) - jjCheckNAddStates(13, 20); + jjCheckNAddStates(13, 18); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1291,7 +1291,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { if (kind > 95) kind = 95; - jjCheckNAddStates(21, 23); + jjCheckNAddStates(19, 21); } break; case 0: @@ -1329,7 +1329,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 99) kind = 99; - jjCheckNAddStates(24, 26); + jjCheckNAddStates(22, 24); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1373,14 +1373,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 99) kind = 99; - jjCheckNAddStates(27, 29); + jjCheckNAddStates(25, 27); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAddStates(27, 29); + jjCheckNAddStates(25, 27); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1410,7 +1410,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(30, 32); + jjCheckNAddStates(28, 30); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1425,7 +1425,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; if (kind > 95) kind = 95; - jjCheckNAddStates(21, 23); + jjCheckNAddStates(19, 21); break; case 35: if ((0x3ff000000000000L & l) == 0L) @@ -1443,73 +1443,65 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 37: if (curChar == 34) - jjCheckNAddStates(13, 20); + jjCheckNAddStates(13, 18); break; case 38: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(33, 36); + jjCheckNAddStates(31, 33); break; case 39: if (curChar == 34) - jjCheckNAddStates(33, 36); + jjCheckNAddStates(31, 33); break; - case 42: - if ((0xfffffffbffffffffL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 43; - break; - case 44: + case 41: if (curChar == 34 && kind > 101) kind = 101; break; - case 45: + case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(37, 40); + jjCheckNAddStates(34, 36); break; - case 46: + case 43: if (curChar == 34) - jjCheckNAddStates(37, 40); + jjCheckNAddStates(34, 36); break; - case 49: - if ((0xfffffffbffffffffL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 50; - break; - case 51: + case 45: if (curChar == 34 && kind > 102) kind = 102; break; - case 52: + case 46: if (curChar == 39) jjCheckNAddStates(7, 12); break; - case 53: + case 47: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(41, 43); + jjCheckNAddStates(37, 39); break; - case 54: + case 48: if (curChar == 39) - jjCheckNAddStates(41, 43); + jjCheckNAddStates(37, 39); break; - case 56: + case 50: if (curChar == 39 && kind > 101) kind = 101; break; - case 57: + case 51: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(44, 46); + jjCheckNAddStates(40, 42); break; - case 58: + case 52: if (curChar == 39) - jjCheckNAddStates(44, 46); + jjCheckNAddStates(40, 42); break; - case 60: + case 54: if (curChar == 39 && kind > 103) kind = 103; break; - case 62: - jjAddStates(47, 49); + case 56: + jjAddStates(43, 45); break; - case 66: - jjAddStates(50, 52); + case 60: + jjAddStates(46, 48); break; default : break; } @@ -1530,7 +1522,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(53, 58); + jjCheckNAddStates(49, 54); break; case 1: if (kind > 13) @@ -1542,7 +1534,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(59, 60); + jjAddStates(55, 56); break; case 12: if ((0x5000000050L & l) != 0L && kind > 99) @@ -1566,15 +1558,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(61, 62); + jjAddStates(57, 58); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(63, 64); + jjAddStates(59, 60); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(65, 66); + jjAddStates(61, 62); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1588,90 +1580,66 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddTwoStates(35, 6); break; case 38: - if ((0xd7ffffffffffffffL & l) != 0L) - jjCheckNAddStates(33, 36); + jjAddStates(31, 33); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; - case 41: - if (curChar == 123) - jjstateSet[jjnewStateCnt++] = 42; - break; case 42: - jjstateSet[jjnewStateCnt++] = 43; - break; - case 43: - if (curChar == 125) - jjCheckNAddStates(33, 36); - break; - case 45: - if ((0xd7ffffffffffffffL & l) != 0L) - jjCheckNAddStates(37, 40); + jjAddStates(34, 36); break; - case 47: + case 44: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 46; + jjstateSet[jjnewStateCnt++] = 43; break; - case 48: - if (curChar == 123) - jjstateSet[jjnewStateCnt++] = 49; + case 47: + jjAddStates(37, 39); break; case 49: - jjstateSet[jjnewStateCnt++] = 50; - break; - case 50: - if (curChar == 125) - jjCheckNAddStates(37, 40); - break; - case 53: - jjAddStates(41, 43); - break; - case 55: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 54; + jjstateSet[jjnewStateCnt++] = 48; break; - case 57: - jjAddStates(44, 46); + case 51: + jjAddStates(40, 42); break; - case 59: + case 53: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 58; + jjstateSet[jjnewStateCnt++] = 52; break; - case 61: + case 55: if (curChar == 96) - jjCheckNAddStates(53, 58); + jjCheckNAddStates(49, 54); break; - case 62: + case 56: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(47, 49); + jjCheckNAddStates(43, 45); break; - case 63: + case 57: if (curChar == 96) - jjCheckNAddStates(47, 49); + jjCheckNAddStates(43, 45); break; - case 64: + case 58: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 63; + jjstateSet[jjnewStateCnt++] = 57; break; - case 65: + case 59: if (curChar == 96 && kind > 101) kind = 101; break; - case 66: + case 60: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(50, 52); + jjCheckNAddStates(46, 48); break; - case 67: + case 61: if (curChar == 96) - jjCheckNAddStates(50, 52); + jjCheckNAddStates(46, 48); break; - case 68: + case 62: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 67; + jjstateSet[jjnewStateCnt++] = 61; break; - case 69: + case 63: if (curChar == 96 && kind > 104) kind = 104; break; @@ -1709,35 +1677,27 @@ static private final int jjMoveNfa_1(int startState, int curPos) break; case 38: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(33, 36); + jjAddStates(31, 33); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjstateSet[jjnewStateCnt++] = 43; - break; - case 45: - if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 40); + jjAddStates(34, 36); break; - case 49: - if ((jjbitVec0[i2] & l2) != 0L) - jjstateSet[jjnewStateCnt++] = 50; - break; - case 53: + case 47: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(41, 43); + jjAddStates(37, 39); break; - case 57: + case 51: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(44, 46); + jjAddStates(40, 42); break; - case 62: + case 56: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(47, 49); + jjAddStates(43, 45); break; - case 66: + case 60: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(50, 52); + jjAddStates(46, 48); break; default : break; } @@ -1750,7 +1710,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 70 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -1784,11 +1744,10 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) return 2; } static final int[] jjnextStates = { - 19, 20, 25, 26, 29, 30, 12, 53, 55, 56, 57, 59, 60, 38, 40, 41, - 44, 45, 47, 48, 51, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, - 12, 38, 40, 41, 44, 45, 47, 48, 51, 53, 55, 56, 57, 59, 60, 62, - 64, 65, 66, 68, 69, 62, 64, 65, 66, 68, 69, 10, 11, 23, 24, 27, - 28, 31, 32, + 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 = { "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, @@ -1832,8 +1791,8 @@ static final long[] jjtoMore = { 0x80000L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; -static private final int[] jjrounds = new int[70]; -static private final int[] jjstateSet = new int[140]; +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; @@ -1860,7 +1819,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 70; i-- > 0;) + for (i = 64; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState)