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 18ddad9..016518a 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -6,14 +6,16 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.jface.preference.IPreferenceStore; import java.util.Hashtable; -import java.util.ArrayList; import java.util.Enumeration; +import java.util.ArrayList; import java.io.StringReader; import java.io.*; import java.text.MessageFormat; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; -import net.sourceforge.phpdt.internal.compiler.parser.*; +import net.sourceforge.phpdt.internal.compiler.ast.*; +import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren; +import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; public class PHPParserTokenManager implements PHPParserConstants { @@ -299,41 +301,41 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x4800L) != 0L || (active1 & 0x400000000000L) != 0L || (active2 & 0x4L) != 0L) + if ((active0 & 0x4800L) != 0L || (active1 & 0x200000L) != 0L || (active2 & 0x8L) != 0L) return 2; - if ((active1 & 0x40000000000000L) != 0L) + if ((active1 & 0x200L) != 0L) return 16; - if ((active1 & 0x4000100000000L) != 0L) + if ((active1 & 0x20000000000000L) != 0L || (active2 & 0x80L) != 0L) return 8; - if ((active0 & 0xffffff1ffff00000L) != 0L || (active1 & 0x3ffL) != 0L) + if ((active0 & 0xffffff1ffff00000L) != 0L || (active1 & 0x600000ffL) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 105; return 14; } return -1; case 1: - if ((active0 & 0xbfffef1fff700000L) != 0L || (active1 & 0x2efL) != 0L) + if ((active0 & 0x4000L) != 0L) + return 0; + if ((active0 & 0xbfffef1fff700000L) != 0L || (active1 & 0x400000efL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 1; } return 14; } - if ((active0 & 0x4000L) != 0L) - return 0; - if ((active0 & 0x4000100000800000L) != 0L || (active1 & 0x110L) != 0L) + if ((active0 & 0x4000100000800000L) != 0L || (active1 & 0x20000010L) != 0L) return 14; return -1; case 2: - if ((active0 & 0x2001400000400000L) != 0L || (active1 & 0x2c0L) != 0L) + if ((active0 & 0x2001400000400000L) != 0L || (active1 & 0x400000c0L) != 0L) return 14; if ((active0 & 0x9ffeaf1fff300000L) != 0L || (active1 & 0x3fL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 2; } return 14; @@ -346,28 +348,28 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac { if (jjmatchedPos != 3) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 3; } return 14; } return -1; case 4: + if ((active0 & 0x98802002c100000L) != 0L || (active1 & 0x20L) != 0L) + return 14; if ((active0 & 0xb6142c1f81200000L) != 0L || (active1 & 0x95L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 4; return 14; } - if ((active0 & 0x98802002c100000L) != 0L || (active1 & 0x20L) != 0L) - return 14; return -1; case 5: if ((active0 & 0x9014001801000000L) != 0L || (active1 & 0x11L) != 0L) return 14; if ((active0 & 0x26002c0780200000L) != 0L || (active1 & 0x84L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 5; return 14; } @@ -379,7 +381,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac { if (jjmatchedPos != 6) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 6; } return 14; @@ -390,25 +392,25 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac return 14; if ((active0 & 0x400000600000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 7; return 14; } return -1; case 8: + if ((active0 & 0x400000000000000L) != 0L) + return 14; if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 8; return 14; } - if ((active0 & 0x400000000000000L) != 0L) - return 14; return -1; case 9: if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 9; return 14; } @@ -416,7 +418,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac case 10: if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 84; + jjmatchedKind = 105; jjmatchedPos = 10; return 14; } @@ -442,68 +444,68 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 119; - return jjMoveStringLiteralDfa1_1(0x0L, 0x14000000000L, 0x0L); + jjmatchedKind = 74; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2800000000000000L, 0x0L); case 35: return jjStopAtPos(0, 12); case 36: - return jjStartNfaWithStates_1(0, 118, 16); + return jjStartNfaWithStates_1(0, 73, 16); case 37: - jjmatchedKind = 134; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000L, 0x0L); + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L); case 38: - jjmatchedKind = 131; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000800000000000L, 0x0L); + jjmatchedKind = 86; + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000L, 0x10L); case 40: - return jjStopAtPos(0, 88); + return jjStopAtPos(0, 109); case 41: - return jjStopAtPos(0, 89); + return jjStopAtPos(0, 110); case 42: - jjmatchedKind = 129; - return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000L, 0x0L); + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x4L); case 43: - jjmatchedKind = 127; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000080000000000L, 0x0L); + jjmatchedKind = 82; + return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x1L); case 44: - return jjStopAtPos(0, 95); + return jjStopAtPos(0, 116); case 45: - jjmatchedKind = 128; - return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x4000100000000000L, 0x0L); + jjmatchedKind = 83; + return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x20000L, 0x2L); case 46: - jjmatchedKind = 96; - return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L); + jjmatchedKind = 117; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x80L); case 47: - jjmatchedKind = 130; - return jjMoveStringLiteralDfa1_1(0x4800L, 0x400000000000L, 0x0L); + jjmatchedKind = 85; + return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x8L); case 58: - jjmatchedKind = 122; + jjmatchedKind = 77; return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 94); + return jjStopAtPos(0, 115); case 60: - jjmatchedKind = 98; - return jjMoveStringLiteralDfa1_1(0x0L, 0x9000000000L, 0x480L); + jjmatchedKind = 119; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1200000004000000L, 0x400L); case 61: - jjmatchedKind = 106; - return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x20800000000L, 0x0L); + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x4100000000000000L, 0x0L); case 62: - jjmatchedKind = 97; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000L, 0xb00L); + jjmatchedKind = 118; + return jjMoveStringLiteralDfa1_1(0x0L, 0x400000018000000L, 0x800L); case 63: - jjmatchedKind = 121; + jjmatchedKind = 76; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 117); + return jjStopAtPos(0, 72); case 91: - return jjStopAtPos(0, 92); + return jjStopAtPos(0, 113); case 93: - return jjStopAtPos(0, 93); + return jjStopAtPos(0, 114); case 94: - jjmatchedKind = 133; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); + jjmatchedKind = 88; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x40L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x4000000004000000L, 0x200L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4000000004000000L, 0x40000000L, 0x0L); case 66: case 98: return jjMoveStringLiteralDfa1_1(0x8000000L, 0x6L, 0x0L); @@ -533,7 +535,7 @@ static private final int jjMoveStringLiteralDfa0_1() return jjMoveStringLiteralDfa1_1(0x3000000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x0L, 0x101L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x20000001L, 0x0L); case 80: case 112: return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); @@ -553,15 +555,15 @@ static private final int jjMoveStringLiteralDfa0_1() case 119: return jjMoveStringLiteralDfa1_1(0x100000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 90); + return jjStopAtPos(0, 111); case 124: - jjmatchedKind = 132; - return jjMoveStringLiteralDfa1_1(0x0L, 0x801000000000000L, 0x0L); + jjmatchedKind = 87; + return jjMoveStringLiteralDfa1_1(0x0L, 0x4000L, 0x20L); case 125: - return jjStopAtPos(0, 91); + return jjStopAtPos(0, 112); case 126: - jjmatchedKind = 120; - return jjMoveStringLiteralDfa1_1(0x0L, 0x10000000000000L, 0x0L); + jjmatchedKind = 75; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L); default : return jjMoveNfa_1(3, 0); } @@ -576,20 +578,20 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x1000000000000000L) != 0L) - return jjStopAtPos(1, 124); + if ((active1 & 0x8000L) != 0L) + return jjStopAtPos(1, 79); break; case 42: if ((active0 & 0x4000L) != 0L) return jjStartNfaWithStates_1(1, 14, 0); break; case 43: - if ((active1 & 0x2000000000000000L) != 0L) - return jjStopAtPos(1, 125); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; case 45: - if ((active1 & 0x4000000000000000L) != 0L) - return jjStopAtPos(1, 126); + if ((active1 & 0x20000L) != 0L) + return jjStopAtPos(1, 81); break; case 47: if ((active0 & 0x800L) != 0L) @@ -600,48 +602,48 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 38); break; case 60: - if ((active2 & 0x80L) != 0L) + if ((active1 & 0x4000000L) != 0L) { - jjmatchedKind = 135; + jjmatchedKind = 90; jjmatchedPos = 1; } return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x400L); case 61: - if ((active1 & 0x800000000L) != 0L) + if ((active1 & 0x100000000000000L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 120; jjmatchedPos = 1; } - else if ((active1 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 100); - else if ((active1 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 101); - else if ((active1 & 0x4000000000L) != 0L) + else if ((active1 & 0x200000000000000L) != 0L) + return jjStopAtPos(1, 121); + else if ((active1 & 0x400000000000000L) != 0L) + return jjStopAtPos(1, 122); + else if ((active1 & 0x800000000000000L) != 0L) { - jjmatchedKind = 102; + jjmatchedKind = 123; jjmatchedPos = 1; } - else if ((active1 & 0x80000000000L) != 0L) - return jjStopAtPos(1, 107); - else if ((active1 & 0x100000000000L) != 0L) - return jjStopAtPos(1, 108); - else if ((active1 & 0x200000000000L) != 0L) - return jjStopAtPos(1, 109); - else if ((active1 & 0x400000000000L) != 0L) - return jjStopAtPos(1, 110); - else if ((active1 & 0x800000000000L) != 0L) - return jjStopAtPos(1, 111); - else if ((active1 & 0x1000000000000L) != 0L) - return jjStopAtPos(1, 112); - else if ((active1 & 0x2000000000000L) != 0L) - return jjStopAtPos(1, 113); - else if ((active1 & 0x4000000000000L) != 0L) - return jjStopAtPos(1, 114); - else if ((active1 & 0x8000000000000L) != 0L) - return jjStopAtPos(1, 115); - else if ((active1 & 0x10000000000000L) != 0L) - return jjStopAtPos(1, 116); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x30000000000L, active2, 0L); + else if ((active2 & 0x1L) != 0L) + return jjStopAtPos(1, 128); + else if ((active2 & 0x2L) != 0L) + return jjStopAtPos(1, 129); + else if ((active2 & 0x4L) != 0L) + return jjStopAtPos(1, 130); + else if ((active2 & 0x8L) != 0L) + return jjStopAtPos(1, 131); + else if ((active2 & 0x10L) != 0L) + return jjStopAtPos(1, 132); + else if ((active2 & 0x20L) != 0L) + return jjStopAtPos(1, 133); + else if ((active2 & 0x40L) != 0L) + return jjStopAtPos(1, 134); + else if ((active2 & 0x80L) != 0L) + return jjStopAtPos(1, 135); + else if ((active2 & 0x100L) != 0L) + return jjStopAtPos(1, 136); + else if ((active2 & 0x200L) != 0L) + return jjStopAtPos(1, 137); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000000000L, active2, 0L); case 62: if ((active0 & 0x10L) != 0L) return jjStopAtPos(1, 4); @@ -649,14 +651,14 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 37); else if ((active0 & 0x8000000000L) != 0L) return jjStopAtPos(1, 39); - else if ((active1 & 0x8000000000L) != 0L) - return jjStopAtPos(1, 103); - else if ((active2 & 0x100L) != 0L) + else if ((active1 & 0x8000000L) != 0L) { - jjmatchedKind = 136; + jjmatchedKind = 91; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0xa00L); + else if ((active1 & 0x1000000000000000L) != 0L) + return jjStopAtPos(1, 124); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x10000000L, active2, 0x800L); case 65: case 97: return jjMoveStringLiteralDfa2_1(active0, 0x80010000400000L, active1, 0L, active2, 0L); @@ -685,7 +687,7 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjMoveStringLiteralDfa2_1(active0, 0x803100000L, active1, 0x20L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x1e00000280000000L, active1, 0x2c0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1e00000280000000L, active1, 0x400000c0L, active2, 0L); case 79: case 111: if ((active0 & 0x100000000000L) != 0L) @@ -696,8 +698,8 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjMoveStringLiteralDfa2_1(active0, 0x2000c60000000000L, active1, 0x16L, active2, 0L); case 82: case 114: - if ((active1 & 0x100L) != 0L) - return jjStartNfaWithStates_1(1, 72, 14); + if ((active1 & 0x20000000L) != 0L) + return jjStartNfaWithStates_1(1, 93, 14); return jjMoveStringLiteralDfa2_1(active0, 0x4000002c000000L, active1, 0L, active2, 0L); case 83: case 115: @@ -717,8 +719,8 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l case 120: return jjMoveStringLiteralDfa2_1(active0, 0x200000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x800000000000000L) != 0L) - return jjStopAtPos(1, 123); + if ((active1 & 0x4000L) != 0L) + return jjStopAtPos(1, 78); break; default : break; @@ -737,18 +739,18 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x10000000000L) != 0L) - return jjStopAtPos(2, 104); - else if ((active1 & 0x20000000000L) != 0L) - return jjStopAtPos(2, 105); + if ((active1 & 0x2000000000000000L) != 0L) + return jjStopAtPos(2, 125); + else if ((active1 & 0x4000000000000000L) != 0L) + return jjStopAtPos(2, 126); else if ((active2 & 0x400L) != 0L) return jjStopAtPos(2, 138); else if ((active2 & 0x800L) != 0L) return jjStopAtPos(2, 139); break; case 62: - if ((active2 & 0x200L) != 0L) - return jjStopAtPos(2, 137); + if ((active1 & 0x10000000L) != 0L) + return jjStopAtPos(2, 92); break; case 65: case 97: @@ -758,8 +760,8 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x200L) != 0L) - return jjStartNfaWithStates_1(2, 73, 14); + if ((active1 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(2, 94, 14); return jjMoveStringLiteralDfa3_1(active0, 0x1e00000000000000L, active1, 0L, active2, 0L); case 69: case 101: @@ -1281,14 +1283,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 74) - kind = 74; + if (kind > 95) + kind = 95; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 74) - kind = 74; + if (kind > 95) + kind = 95; jjCheckNAddStates(21, 23); } break; @@ -1307,15 +1309,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 95) + kind = 95; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 95) + kind = 95; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1325,8 +1327,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 99) + kind = 99; jjCheckNAddStates(24, 26); break; case 10: @@ -1336,15 +1338,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 84) - kind = 84; + if (kind > 105) + kind = 105; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1369,15 +1371,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 78) - kind = 78; + if (kind > 99) + kind = 99; jjCheckNAddStates(27, 29); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 99) + kind = 99; jjCheckNAddStates(27, 29); break; case 23: @@ -1387,8 +1389,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1402,8 +1404,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 78) - kind = 78; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(28, 12); break; case 29: @@ -1421,22 +1423,22 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 74) - kind = 74; + if (kind > 95) + kind = 95; jjCheckNAddStates(21, 23); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 95) + kind = 95; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 95) + kind = 95; jjCheckNAddTwoStates(36, 6); break; case 37: @@ -1444,7 +1446,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(13, 20); break; case 38: - jjCheckNAddStates(33, 36); + if ((0xfffffffbffffffffL & l) != 0L) + jjCheckNAddStates(33, 36); break; case 39: if (curChar == 34) @@ -1455,11 +1458,12 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 43; break; case 44: - if (curChar == 34 && kind > 80) - kind = 80; + if (curChar == 34 && kind > 101) + kind = 101; break; case 45: - jjCheckNAddStates(37, 40); + if ((0xfffffffbffffffffL & l) != 0L) + jjCheckNAddStates(37, 40); break; case 46: if (curChar == 34) @@ -1470,8 +1474,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 50; break; case 51: - if (curChar == 34 && kind > 81) - kind = 81; + if (curChar == 34 && kind > 102) + kind = 102; break; case 52: if (curChar == 39) @@ -1486,8 +1490,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(41, 43); break; case 56: - if (curChar == 39 && kind > 80) - kind = 80; + if (curChar == 39 && kind > 101) + kind = 101; break; case 57: if ((0xffffff7fffffffffL & l) != 0L) @@ -1498,8 +1502,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(44, 46); break; case 60: - if (curChar == 39 && kind > 82) - kind = 82; + if (curChar == 39 && kind > 103) + kind = 103; break; case 62: jjAddStates(47, 49); @@ -1521,8 +1525,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 84) - kind = 84; + if (kind > 105) + kind = 105; jjCheckNAdd(14); } else if (curChar == 96) @@ -1533,23 +1537,23 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 13; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 74) - kind = 74; + if ((0x100000001000L & l) != 0L && kind > 95) + kind = 95; break; case 9: if ((0x2000000020L & l) != 0L) jjAddStates(59, 60); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 78) - kind = 78; + if ((0x5000000050L & l) != 0L && kind > 99) + kind = 99; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 84) - kind = 84; + if (kind > 105) + kind = 105; jjCheckNAdd(14); break; case 16: @@ -1579,12 +1583,13 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 95) + kind = 95; jjCheckNAddTwoStates(35, 6); break; case 38: - jjCheckNAddStates(33, 36); + if ((0xd7ffffffffffffffL & l) != 0L) + jjCheckNAddStates(33, 36); break; case 40: if (curChar == 92) @@ -1602,7 +1607,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjCheckNAddStates(33, 36); break; case 45: - jjCheckNAddStates(37, 40); + if ((0xd7ffffffffffffffL & l) != 0L) + jjCheckNAddStates(37, 40); break; case 47: if (curChar == 92) @@ -1650,8 +1656,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 63; break; case 65: - if (curChar == 96 && kind > 80) - kind = 80; + if (curChar == 96 && kind > 101) + kind = 101; break; case 66: if ((0xfffffffeffffffffL & l) != 0L) @@ -1666,8 +1672,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 67; break; case 69: - if (curChar == 96 && kind > 83) - kind = 83; + if (curChar == 96 && kind > 104) + kind = 104; break; default : break; } @@ -1685,8 +1691,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 84) - kind = 84; + if (kind > 105) + kind = 105; jjCheckNAdd(14); break; case 1: @@ -1790,13 +1796,13 @@ null, null, null, null, null, null, null, null, null, null, null, null, null, nu null, null, null, null, null, null, null, null, null, null, null, null, "\55\76", "\72\72", "\75\76", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, null, null, null, null, "\50", "\51", "\173", "\175", -"\133", "\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", "\76\75", -"\41\75", "\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", "\52\75", -"\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\100", "\44", -"\41", "\176", "\77", "\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", -"\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", +null, null, null, null, null, null, null, "\100", "\44", "\41", "\176", "\77", +"\72", "\174\174", "\46\46", "\53\53", "\55\55", "\53", "\55", "\52", "\57", "\46", +"\174", "\136", "\45", "\74\74", "\76\76", "\76\76\76", null, null, null, null, null, +null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", +"\173", "\175", "\133", "\135", "\73", "\54", "\56", "\76", "\74", "\75\75", "\74\75", +"\76\75", "\41\75", "\74\76", "\41\75\75", "\75\75\75", "\75", "\53\75", "\55\75", +"\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\56\75", "\45\75", "\176\75", "\74\74\75", "\76\76\75", null, }; public static final String[] lexStateNames = { "DEFAULT", @@ -1814,7 +1820,7 @@ public static final int[] jjnewLexState = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffffffffff0001fL, 0xffffffffff1f47ffL, 0x1fffL, + 0xfffffffffff0001fL, 0xffffe3e8ffffffffL, 0x1fffL, }; static final long[] jjtoSkip = { 0x7ffe0L, 0x0L, 0x0L, @@ -1973,6 +1979,7 @@ public static Token getNextToken() { matchedToken = jjFillToken(); matchedToken.specialToken = specialToken; + TokenLexicalActions(matchedToken); if (jjnewLexState[jjmatchedKind] != -1) curLexState = jjnewLexState[jjmatchedKind]; return matchedToken; @@ -2047,4 +2054,40 @@ static void SkipLexicalActions(Token matchedToken) break; } } +static void TokenLexicalActions(Token matchedToken) +{ + switch(jjmatchedKind) + { + case 1 : + if (image == null) + image = new StringBuffer(jjstrLiteralImages[1]); + else + image.append(jjstrLiteralImages[1]); + PHPParser.createNewHTMLCode(); + break; + case 2 : + if (image == null) + image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + else + image.append(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); + PHPParser.createNewHTMLCode(); + break; + case 3 : + if (image == null) + image = new StringBuffer(jjstrLiteralImages[3]); + else + image.append(jjstrLiteralImages[3]); + PHPParser.createNewHTMLCode(); + break; + case 4 : + if (image == null) + image = new StringBuffer(jjstrLiteralImages[4]); + else + image.append(jjstrLiteralImages[4]); + PHPParser.htmlStart = SimpleCharStream.getPosition(); + break; + default : + break; + } +} }