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 8fd6c8f..26fc6eb 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -16,6 +16,7 @@ import net.sourceforge.phpdt.internal.compiler.ast.*; import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren; import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; +import junit.framework.Assert; public class PHPParserTokenManager implements PHPParserConstants { @@ -1540,9 +1541,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xfffffffbffffffffL & l) != 0L) jjCheckNAddStates(31, 33); break; - case 39: - if (curChar == 34) - jjCheckNAddStates(31, 33); + case 40: + jjCheckNAddStates(31, 33); break; case 41: if (curChar == 34 && kind > 103) @@ -1552,9 +1552,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xfffffffbffffffffL & l) != 0L) jjCheckNAddStates(34, 36); break; - case 43: - if (curChar == 34) - jjCheckNAddStates(34, 36); + case 44: + jjCheckNAddStates(34, 36); break; case 45: if (curChar == 34 && kind > 104) @@ -1568,9 +1567,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xffffff7fffffffffL & l) != 0L) jjCheckNAddStates(37, 39); break; - case 48: - if (curChar == 39) - jjCheckNAddStates(37, 39); + case 49: + jjCheckNAddStates(37, 39); break; case 50: if (curChar == 39 && kind > 103) @@ -1580,19 +1578,20 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xffffff7fffffffffL & l) != 0L) jjCheckNAddStates(40, 42); break; - case 52: - if (curChar == 39) - jjCheckNAddStates(40, 42); + case 53: + jjCheckNAddStates(40, 42); break; case 54: if (curChar == 39 && kind > 105) kind = 105; break; case 56: - jjAddStates(43, 45); + case 58: + jjCheckNAddStates(43, 45); break; case 60: - jjAddStates(46, 48); + case 62: + jjCheckNAddStates(46, 48); break; default : break; } @@ -1671,64 +1670,78 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(31, 33); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(31, 33); break; - case 40: + case 39: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 39; + jjstateSet[jjnewStateCnt++] = 40; + break; + case 40: + jjCheckNAddStates(31, 33); break; case 42: - jjAddStates(34, 36); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(34, 36); break; - case 44: + case 43: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 43; + jjstateSet[jjnewStateCnt++] = 44; + break; + case 44: + jjCheckNAddStates(34, 36); break; case 47: - jjAddStates(37, 39); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(37, 39); break; - case 49: + case 48: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 48; + jjstateSet[jjnewStateCnt++] = 49; + break; + case 49: + jjCheckNAddStates(37, 39); break; case 51: - jjAddStates(40, 42); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(40, 42); break; - case 53: + case 52: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 52; + jjstateSet[jjnewStateCnt++] = 53; + break; + case 53: + jjCheckNAddStates(40, 42); break; case 55: if (curChar == 96) jjCheckNAddStates(49, 54); break; case 56: - if ((0xfffffffeffffffffL & l) != 0L) + if ((0xfffffffeefffffffL & l) != 0L) jjCheckNAddStates(43, 45); break; case 57: - if (curChar == 96) - jjCheckNAddStates(43, 45); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 58; break; case 58: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 57; + jjCheckNAddStates(43, 45); break; case 59: if (curChar == 96 && kind > 103) kind = 103; break; case 60: - if ((0xfffffffeffffffffL & l) != 0L) + if ((0xfffffffeefffffffL & l) != 0L) jjCheckNAddStates(46, 48); break; case 61: - if (curChar == 96) - jjCheckNAddStates(46, 48); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 62; break; case 62: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 61; + jjCheckNAddStates(46, 48); break; case 63: if (curChar == 96 && kind > 106) @@ -1767,28 +1780,34 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAdd(17); break; case 38: + case 40: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(31, 33); + jjCheckNAddStates(31, 33); break; case 42: + case 44: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(34, 36); + jjCheckNAddStates(34, 36); break; case 47: + case 49: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 39); + jjCheckNAddStates(37, 39); break; case 51: + case 53: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(40, 42); + jjCheckNAddStates(40, 42); break; case 56: + case 58: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(43, 45); + jjCheckNAddStates(43, 45); break; case 60: + case 62: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(46, 48); + jjCheckNAddStates(46, 48); break; default : break; } @@ -1878,10 +1897,10 @@ static private final int jjMoveStringLiteralDfa3_3(long old0, long active0) return 4; } static final int[] jjnextStates = { - 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, + 19, 20, 25, 26, 29, 30, 12, 47, 48, 50, 51, 52, 54, 38, 39, 41, + 42, 43, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, + 39, 41, 42, 43, 45, 47, 48, 50, 51, 52, 54, 56, 57, 59, 60, 61, + 63, 56, 57, 59, 60, 61, 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,