X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java index 7ca8f10..464bc79 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -5,120 +5,195 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.jface.preference.IPreferenceStore; -import java.io.CharArrayReader; import java.util.Hashtable; import java.io.StringReader; import java.text.MessageFormat; import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; 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 { public static java.io.PrintStream debugStream = System.out; public static void setDebugStream(java.io.PrintStream ds) { debugStream = ds; } +private static final int jjStopStringLiteralDfa_0(int pos, long active0, long active1, long active2) +{ + switch (pos) + { + default : + return -1; + } +} +private static final int jjStartNfa_0(int pos, long active0, long active1, long active2) +{ + return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1, active2), pos + 1); +} static private final int jjStopAtPos(int pos, int kind) { jjmatchedKind = kind; jjmatchedPos = pos; return pos + 1; } +static private final int jjStartNfaWithStates_0(int pos, int kind, int state) +{ + jjmatchedKind = kind; + jjmatchedPos = pos; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { return pos + 1; } + return jjMoveNfa_0(state, pos + 1); +} static private final int jjMoveStringLiteralDfa0_0() { switch(curChar) { - case 60: - return jjMoveStringLiteralDfa1_0(0x6L, 0x0L); case 63: - return jjMoveStringLiteralDfa1_0(0x0L, 0x1L); + return jjMoveStringLiteralDfa1_0(0x2L); default : - return 1; + return jjMoveNfa_0(0, 0); } } -static private final int jjMoveStringLiteralDfa1_0(long active0, long active2) +static private final int jjMoveStringLiteralDfa1_0(long active2) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { + jjStopStringLiteralDfa_0(0, 0L, 0L, active2); return 1; } switch(curChar) { case 62: - if ((active2 & 0x1L) != 0L) - return jjStopAtPos(1, 128); + if ((active2 & 0x2L) != 0L) + return jjStopAtPos(1, 129); break; - case 63: - if ((active0 & 0x4L) != 0L) - { - jjmatchedKind = 2; - jjmatchedPos = 1; - } - return jjMoveStringLiteralDfa2_0(active0, 0x2L, active2, 0L); default : - return 2; + break; } - return 2; + return jjStartNfa_0(0, 0L, 0L, active2); } -static private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old2, long active2) +static private final void jjCheckNAdd(int state) { - if (((active0 &= old0) | (active2 &= old2)) == 0L) - return 2; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { - return 2; - } - switch(curChar) + if (jjrounds[state] != jjround) { - case 80: - case 112: - return jjMoveStringLiteralDfa3_0(active0, 0x2L); - default : - return 3; + jjstateSet[jjnewStateCnt++] = state; + jjrounds[state] = jjround; } } -static private final int jjMoveStringLiteralDfa3_0(long old0, long active0) +static private final void jjAddStates(int start, int end) { - if (((active0 &= old0)) == 0L) - return 3; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { - return 3; - } - switch(curChar) - { - case 72: - case 104: - return jjMoveStringLiteralDfa4_0(active0, 0x2L); - default : - return 4; - } + do { + jjstateSet[jjnewStateCnt++] = jjnextStates[start]; + } while (start++ != end); } -static private final int jjMoveStringLiteralDfa4_0(long old0, long active0) +static private final void jjCheckNAddTwoStates(int state1, int state2) { - if (((active0 &= old0)) == 0L) - return 4; - try { curChar = input_stream.readChar(); } - catch(java.io.IOException e) { - return 4; - } - switch(curChar) + jjCheckNAdd(state1); + jjCheckNAdd(state2); +} +static private final void jjCheckNAddStates(int start, int end) +{ + do { + jjCheckNAdd(jjnextStates[start]); + } while (start++ != end); +} +static private final void jjCheckNAddStates(int start) +{ + jjCheckNAdd(jjnextStates[start]); + jjCheckNAdd(jjnextStates[start + 1]); +} +static private final int jjMoveNfa_0(int startState, int curPos) +{ + int[] nextStates; + int startsAt = 0; + jjnewStateCnt = 6; + int i = 1; + jjstateSet[0] = startState; + int j, kind = 0x7fffffff; + for (;;) { - case 80: - case 112: - if ((active0 & 0x2L) != 0L) - return jjStopAtPos(4, 1); - break; - default : - return 5; + if (++jjround == 0x7fffffff) + ReInitRounds(); + if (curChar < 64) + { + long l = 1L << curChar; + MatchLoop: do + { + switch(jjstateSet[--i]) + { + case 0: + if (curChar == 60) + jjAddStates(0, 1); + break; + case 4: + if (curChar == 63) + jjstateSet[jjnewStateCnt++] = 3; + break; + case 5: + if (curChar == 63 && kind > 1) + kind = 1; + break; + default : break; + } + } while(i != startsAt); + } + else if (curChar < 128) + { + long l = 1L << (curChar & 077); + MatchLoop: do + { + switch(jjstateSet[--i]) + { + case 1: + if ((0x1000000010000L & l) != 0L && kind > 1) + kind = 1; + break; + case 2: + if ((0x10000000100L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 1; + break; + case 3: + if ((0x1000000010000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 2; + break; + default : break; + } + } while(i != startsAt); + } + else + { + int i2 = (curChar & 0xff) >> 6; + long l2 = 1L << (curChar & 077); + MatchLoop: do + { + switch(jjstateSet[--i]) + { + default : break; + } + } while(i != startsAt); + } + if (kind != 0x7fffffff) + { + jjmatchedKind = kind; + jjmatchedPos = curPos; + kind = 0x7fffffff; + } + ++curPos; + if ((i = jjnewStateCnt) == (startsAt = 6 - (jjnewStateCnt = startsAt))) + return curPos; + try { curChar = input_stream.readChar(); } + catch(java.io.IOException e) { return curPos; } } - return 5; } static private final int jjMoveStringLiteralDfa0_4() { switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_4(0x8000L); + return jjMoveStringLiteralDfa1_4(0x4000L); default : return 1; } @@ -132,8 +207,8 @@ static private final int jjMoveStringLiteralDfa1_4(long active0) switch(curChar) { case 47: - if ((active0 & 0x8000L) != 0L) - return jjStopAtPos(1, 15); + if ((active0 & 0x4000L) != 0L) + return jjStopAtPos(1, 14); break; default : return 2; @@ -144,36 +219,6 @@ static private final int jjMoveStringLiteralDfa0_2() { return jjMoveNfa_2(0, 0); } -static private final void jjCheckNAdd(int state) -{ - if (jjrounds[state] != jjround) - { - jjstateSet[jjnewStateCnt++] = state; - jjrounds[state] = jjround; - } -} -static private final void jjAddStates(int start, int end) -{ - do { - jjstateSet[jjnewStateCnt++] = jjnextStates[start]; - } while (start++ != end); -} -static private final void jjCheckNAddTwoStates(int state1, int state2) -{ - jjCheckNAdd(state1); - jjCheckNAdd(state2); -} -static private final void jjCheckNAddStates(int start, int end) -{ - do { - jjCheckNAdd(jjnextStates[start]); - } while (start++ != end); -} -static private final void jjCheckNAddStates(int start) -{ - jjCheckNAdd(jjnextStates[start]); - jjCheckNAdd(jjnextStates[start + 1]); -} static private final int jjMoveNfa_2(int startState, int curPos) { int[] nextStates; @@ -196,8 +241,8 @@ static private final int jjMoveNfa_2(int startState, int curPos) case 0: if ((0x2400L & l) != 0L) { - if (kind > 13) - kind = 13; + if (kind > 12) + kind = 12; } else if (curChar == 63) jjstateSet[jjnewStateCnt++] = 3; @@ -205,8 +250,8 @@ static private final int jjMoveNfa_2(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if (curChar == 10 && kind > 13) - kind = 13; + if (curChar == 10 && kind > 12) + kind = 12; break; case 2: if (curChar == 13) @@ -214,7 +259,7 @@ static private final int jjMoveNfa_2(int startState, int curPos) break; case 3: if (curChar == 62) - kind = 13; + kind = 12; break; case 4: if (curChar == 63) @@ -260,127 +305,127 @@ 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) { case 0: - if ((active0 & 0xfffffff8fffe0000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0xfffffffc7fff0000L) != 0L) { - jjmatchedKind = 75; + jjmatchedKind = 74; return 14; } - if ((active0 & 0x1400L) != 0L || (active1 & 0x40080000000000L) != 0L) + if ((active0 & 0xa00L) != 0L || (active1 & 0x20040000000000L) != 0L) return 2; - if ((active1 & 0x2000000L) != 0L) + if ((active1 & 0x1000000L) != 0L) return 16; - if ((active1 & 0x400000000800000L) != 0L) + if ((active1 & 0x200000000400000L) != 0L) return 8; return -1; case 1: - if ((active0 & 0x1000L) != 0L) + if ((active0 & 0x800L) != 0L) return 0; - if ((active0 & 0x8800010000100000L) != 0L) + if ((active0 & 0x4400008000080000L) != 0L) return 14; - if ((active0 & 0x77fffef8ffee0000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0xbbffff7c7ff70000L) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 1; } return 14; } return -1; case 2: - if ((active0 & 0x6000280000080000L) != 0L || (active1 & 0x1L) != 0L) + if ((active0 & 0xb000140000040000L) != 0L) return 14; - if ((active0 & 0x1fffd6f8ffe60000L) != 0L) + if ((active0 & 0xfffeb7c7ff30000L) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0x58f386e8fd860000L) != 0L) + if ((active0 & 0x2c79c3747ec30000L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 3; } return 14; } - if ((active0 & 0x70c501002600000L) != 0L) + if ((active0 & 0x386280801300000L) != 0L) return 14; return -1; case 4: - if ((active0 & 0x1011042801820000L) != 0L) + if ((active0 & 0x808821400c10000L) != 0L) return 14; - if ((active0 & 0x4ae282c0fc240000L) != 0L) + if ((active0 & 0x257141607e120000L) != 0L) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 4; return 14; } return -1; case 5: - if ((active0 & 0x8c28000c0200000L) != 0L) + if ((active0 & 0x461400060100000L) != 0L) return 14; - if ((active0 & 0x422002c03c040000L) != 0L) + if ((active0 & 0x211001601e020000L) != 0L) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x420002803c000000L) != 0L) + if ((active0 & 0x210001401e000000L) != 0L) return 14; - if ((active0 & 0x20004000040000L) != 0L) + if ((active0 & 0x10002000020000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 6; } return 14; } return -1; case 7: - if ((active0 & 0x30000000L) != 0L) + if ((active0 & 0x10002000020000L) != 0L) + return 14; + if ((active0 & 0x18000000L) != 0L) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 7; return 14; } - if ((active0 & 0x20004000040000L) != 0L) - return 14; return -1; case 8: - if ((active0 & 0x30000000L) != 0L) + if ((active0 & 0x18000000L) != 0L) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 8; return 14; } return -1; case 9: - if ((active0 & 0x30000000L) != 0L) + if ((active0 & 0x18000000L) != 0L) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 9; return 14; } return -1; case 10: - if ((active0 & 0x30000000L) != 0L) + if ((active0 & 0x18000000L) != 0L) { - jjmatchedKind = 75; + jjmatchedKind = 74; jjmatchedPos = 10; return 14; } @@ -389,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) { @@ -406,118 +451,120 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 93; - return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000L); + jjmatchedKind = 92; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000400000000L); case 36: - return jjStartNfaWithStates_1(0, 89, 16); + return jjStartNfaWithStates_1(0, 88, 16); case 37: - jjmatchedKind = 111; - return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000000L); + jjmatchedKind = 110; + return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000000L); case 38: - jjmatchedKind = 108; - return jjMoveStringLiteralDfa1_1(0x0L, 0x80002000000000L); + jjmatchedKind = 107; + return jjMoveStringLiteralDfa1_1(0x0L, 0x40001000000000L); case 40: - return jjStopAtPos(0, 79); + return jjStopAtPos(0, 78); case 41: - return jjStopAtPos(0, 80); + return jjStopAtPos(0, 79); case 42: - jjmatchedKind = 106; - return jjMoveStringLiteralDfa1_1(0x0L, 0x20000000000000L); + jjmatchedKind = 105; + return jjMoveStringLiteralDfa1_1(0x0L, 0x10000000000000L); case 43: - jjmatchedKind = 104; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8004000000000L); + jjmatchedKind = 103; + return jjMoveStringLiteralDfa1_1(0x0L, 0x4002000000000L); case 44: - return jjStopAtPos(0, 86); + return jjStopAtPos(0, 85); case 45: - jjmatchedKind = 105; - return jjMoveStringLiteralDfa1_1(0x100000000L, 0x10008000000000L); + jjmatchedKind = 104; + return jjMoveStringLiteralDfa1_1(0x80000000L, 0x8004000000000L); case 46: - jjmatchedKind = 87; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400000000000000L); + jjmatchedKind = 86; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000000L); case 47: - jjmatchedKind = 107; - return jjMoveStringLiteralDfa1_1(0x1400L, 0x40000000000000L); + jjmatchedKind = 106; + return jjMoveStringLiteralDfa1_1(0xa00L, 0x20000000000000L); case 58: - jjmatchedKind = 95; - return jjMoveStringLiteralDfa1_1(0x200000000L, 0x0L); + jjmatchedKind = 94; + return jjMoveStringLiteralDfa1_1(0x100000000L, 0x0L); case 59: - return jjStopAtPos(0, 85); + return jjStopAtPos(0, 84); case 60: - jjmatchedKind = 92; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1001000200000000L); + jjmatchedKind = 91; + return jjMoveStringLiteralDfa1_1(0x0L, 0x800800100000000L); case 61: - jjmatchedKind = 90; - return jjMoveStringLiteralDfa1_1(0x400000000L, 0x100000000L); + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_1(0x200000000L, 0x4000000080000000L); case 62: - jjmatchedKind = 91; - return jjMoveStringLiteralDfa1_1(0x0L, 0x6006000400000000L); + jjmatchedKind = 90; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1003000200000000L); case 63: - jjmatchedKind = 94; - return jjMoveStringLiteralDfa1_1(0x10L, 0x0L); + jjmatchedKind = 93; + return jjMoveStringLiteralDfa1_1(0x4L, 0x0L); case 64: - return jjStopAtPos(0, 88); + return jjStopAtPos(0, 87); case 91: - return jjStopAtPos(0, 83); + return jjStopAtPos(0, 82); case 93: - return jjStopAtPos(0, 84); + return jjStopAtPos(0, 83); case 94: - jjmatchedKind = 110; - return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000000L); + jjmatchedKind = 109; + return jjMoveStringLiteralDfa1_1(0x0L, 0x100000000000000L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x800000L, 0x1L); + return jjMoveStringLiteralDfa1_1(0x8000000000400000L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x300000800000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x180000400000000L, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0x7000020000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x3800010000L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x800018000000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x40000c000000000L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x20020002600000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x10010001300000L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x10000c0000040000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800060000020000L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x100040000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x80020000000L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x6000000014100000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x300000000a080000L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0x600000000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x300000000000L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x8080000000000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4040000000000000L, 0x0L); case 80: case 112: - return jjMoveStringLiteralDfa1_1(0x1000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x400800028000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x200400014000000L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x43000080000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x21800040000000L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x6000000000000L, 0x0L); case 86: case 118: - return jjMoveStringLiteralDfa1_1(0x80000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x40000L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x10000000000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000000000000L, 0x0L); case 123: - return jjStopAtPos(0, 81); + return jjStopAtPos(0, 80); case 124: - jjmatchedKind = 109; - return jjMoveStringLiteralDfa1_1(0x0L, 0x100001000000000L); + jjmatchedKind = 108; + return jjMoveStringLiteralDfa1_1(0x0L, 0x80000800000000L); case 125: - return jjStopAtPos(0, 82); + return jjStopAtPos(0, 81); + case 126: + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000000L); default : return jjMoveNfa_1(3, 0); } @@ -526,51 +573,59 @@ 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) { case 38: - if ((active1 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 101); + if ((active1 & 0x1000000000L) != 0L) + return jjStopAtPos(1, 100); break; case 42: - if ((active0 & 0x1000L) != 0L) - return jjStartNfaWithStates_1(1, 12, 0); + if ((active0 & 0x800L) != 0L) + return jjStartNfaWithStates_1(1, 11, 0); break; case 43: - if ((active1 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 102); + if ((active1 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 101); break; case 45: - if ((active1 & 0x8000000000L) != 0L) - return jjStopAtPos(1, 103); + if ((active1 & 0x4000000000L) != 0L) + return jjStopAtPos(1, 102); break; case 47: - if ((active0 & 0x400L) != 0L) - return jjStopAtPos(1, 10); + if ((active0 & 0x200L) != 0L) + return jjStopAtPos(1, 9); break; case 58: - if ((active0 & 0x200000000L) != 0L) - return jjStopAtPos(1, 33); + if ((active0 & 0x100000000L) != 0L) + return jjStopAtPos(1, 32); break; case 60: - if ((active1 & 0x1000000000000L) != 0L) + if ((active1 & 0x800000000000L) != 0L) { - jjmatchedKind = 112; + jjmatchedKind = 111; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1000000000000000L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x800000000000000L); case 61: - if ((active1 & 0x100000000L) != 0L) + if ((active1 & 0x80000000L) != 0L) + { + 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); - else if ((active1 & 0x800000000L) != 0L) - return jjStopAtPos(1, 99); + { + jjmatchedKind = 98; + jjmatchedPos = 1; + } + else if ((active1 & 0x4000000000000L) != 0L) + return jjStopAtPos(1, 114); else if ((active1 & 0x8000000000000L) != 0L) return jjStopAtPos(1, 115); else if ((active1 & 0x10000000000000L) != 0L) @@ -587,569 +642,566 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1) return jjStopAtPos(1, 121); else if ((active1 & 0x400000000000000L) != 0L) return jjStopAtPos(1, 122); - else if ((active1 & 0x800000000000000L) != 0L) - return jjStopAtPos(1, 123); - break; + else if ((active1 & 0x8000000000000000L) != 0L) + return jjStopAtPos(1, 127); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6000000000000000L); case 62: - if ((active0 & 0x10L) != 0L) - return jjStopAtPos(1, 4); - else if ((active0 & 0x100000000L) != 0L) - return jjStopAtPos(1, 32); - else if ((active0 & 0x400000000L) != 0L) - return jjStopAtPos(1, 34); - else if ((active1 & 0x2000000000000L) != 0L) + if ((active0 & 0x4L) != 0L) + return jjStopAtPos(1, 2); + else if ((active0 & 0x80000000L) != 0L) + return jjStopAtPos(1, 31); + else if ((active0 & 0x200000000L) != 0L) + return jjStopAtPos(1, 33); + else if ((active1 & 0x1000000000000L) != 0L) { - jjmatchedKind = 113; + jjmatchedKind = 112; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x6004000000000000L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1002000000000000L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x41000080000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20800040000L, active1, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40000000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa2_1(active0, 0x2000000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1000000L, active1, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x400a08028000000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x200504014000000L, active1, 0L); case 70: case 102: - if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_1(1, 20, 14); + if ((active0 & 0x80000L) != 0L) + return jjStartNfaWithStates_1(1, 19, 14); break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x14000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xa000000000000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x1000000040620000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x800000020310000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x6020000014000000L, active1, 0x1L); + return jjMoveStringLiteralDfa2_1(active0, 0xb01000000a000000L, active1, 0L); case 79: case 111: - if ((active0 & 0x10000000000L) != 0L) + if ((active0 & 0x8000000000L) != 0L) { - jjmatchedKind = 40; + jjmatchedKind = 39; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0xb00186000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x5800c3000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 63, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x8000801800000L, active1, 0L); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(1, 62, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x4000400c00000L, active1, 0L); case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x40000080000000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x20000040000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0x1400000040000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xa00000020000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x2000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1000000000000L, active1, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x20000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x10000000000L, active1, 0L); case 124: - if ((active1 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 100); + if ((active1 & 0x800000000L) != 0L) + return jjStopAtPos(1, 99); break; 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) { case 61: - if ((active1 & 0x1000000000000000L) != 0L) + if ((active1 & 0x800000000000000L) != 0L) + 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 & 0x4000000000000L) != 0L) - { - jjmatchedKind = 114; - jjmatchedPos = 2; - } - return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x4000000000000000L); + if ((active1 & 0x2000000000000L) != 0L) + return jjStopAtPos(2, 113); + break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x400000080020000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x200000040010000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_1(active0, 0x14000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xa000000L, active1, 0L); case 68: case 100: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(2, 64, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0L); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(2, 63, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0L); case 69: case 101: - return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x400000000L, active1, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000000000L, active1, 0L); case 72: case 104: - return jjMoveStringLiteralDfa3_1(active0, 0x2000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x16000001000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xb000000800000L, active1, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x440000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x220000000000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0x6000040000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x3000020000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x1300000040000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x980000020000000L, active1, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x1000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x800000000000L, active1, 0L); case 81: case 113: - return jjMoveStringLiteralDfa3_1(active0, 0x28000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x14000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x80000L) != 0L) - return jjStartNfaWithStates_1(2, 19, 14); - else if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_1(2, 43, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x40000000800000L, active1, 0L); + if ((active0 & 0x40000L) != 0L) + return jjStartNfaWithStates_1(2, 18, 14); + else if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_1(2, 42, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x20000000400000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x1000600000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x800300000L, active1, 0L); case 84: case 116: - if ((active0 & 0x2000000000000000L) != 0L) + if ((active0 & 0x1000000000000000L) != 0L) { - jjmatchedKind = 61; + jjmatchedKind = 60; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x4000920000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x2000490000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x808000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x404000000000000L, active1, 0L); case 87: case 119: - if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_1(2, 45, 14); + if ((active0 & 0x100000000000L) != 0L) + return jjStartNfaWithStates_1(2, 44, 14); break; 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 & 0x4000000000000000L) != 0L) - return jjStopAtPos(3, 126); - break; case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x1000008800800000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x800004400400000L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x800000040000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400000020000000L); case 67: case 99: - return jjMoveStringLiteralDfa4_1(active0, 0x40000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x20000L); case 69: case 101: - if ((active0 & 0x400000L) != 0L) + if ((active0 & 0x200000L) != 0L) { - jjmatchedKind = 22; + jjmatchedKind = 21; jjmatchedPos = 3; } - else if ((active0 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_1(3, 36, 14); - else if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 51, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x4081020000200000L, active1, 0L); + else if ((active0 & 0x800000000L) != 0L) + return jjStartNfaWithStates_1(3, 35, 14); + else if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 50, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x2040810000100000L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L); case 76: case 108: - if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_1(3, 46, 14); - else if ((active0 & 0x100000000000000L) != 0L) + if ((active0 & 0x200000000000L) != 0L) + return jjStartNfaWithStates_1(3, 45, 14); + else if ((active0 & 0x80000000000000L) != 0L) { - jjmatchedKind = 56; + jjmatchedKind = 55; jjmatchedPos = 3; } - else if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 58, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x210000014000000L, active1, 0L); + else if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 57, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x10800000a000000L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x1000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x800000L); case 79: case 111: - if ((active0 & 0x2000000L) != 0L) - return jjStartNfaWithStates_1(3, 25, 14); - else if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_1(3, 44, 14); + if ((active0 & 0x1000000L) != 0L) + return jjStartNfaWithStates_1(3, 24, 14); + else if ((active0 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_1(3, 43, 14); break; case 83: case 115: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 50, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x42000020000L, active1, 0L); + if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 49, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x21000010000L); case 84: case 116: - return jjMoveStringLiteralDfa4_1(active0, 0x2004080000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1002040000000L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x800028000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x400014000000L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x20000000000000L, 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) { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x40000000L); + return jjMoveStringLiteralDfa5_1(active0, 0x20000000L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x82000000000000L); + return jjMoveStringLiteralDfa5_1(active0, 0x41000000000000L); case 69: case 101: - if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_1(4, 42, 14); - else if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 52, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L); + if ((active0 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_1(4, 41, 14); + else if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 51, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x100000000000000L); case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000000L); + return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x40a8200000L); + return jjMoveStringLiteralDfa5_1(active0, 0x2054100000L); case 75: case 107: - if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_1(4, 35, 14); + if ((active0 & 0x400000000L) != 0L) + return jjStartNfaWithStates_1(4, 34, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x40020000000000L); + return jjMoveStringLiteralDfa5_1(active0, 0x20010000000000L); case 82: case 114: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 48, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x800000000000L); + if ((active0 & 0x800000000000L) != 0L) + return jjStartNfaWithStates_1(4, 47, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000L); case 83: case 115: - if ((active0 & 0x20000L) != 0L) - return jjStartNfaWithStates_1(4, 17, 14); + if ((active0 & 0x10000L) != 0L) + return jjStartNfaWithStates_1(4, 16, 14); break; case 84: case 116: - if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_1(4, 24, 14); - else if ((active0 & 0x2000000000L) != 0L) - return jjStartNfaWithStates_1(4, 37, 14); - else if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 60, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x40000L); + if ((active0 & 0x800000L) != 0L) + return jjStartNfaWithStates_1(4, 23, 14); + else if ((active0 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(4, 36, 14); + else if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 59, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x20000L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x8014000000L); + return jjMoveStringLiteralDfa5_1(active0, 0x400a000000L); case 89: case 121: - if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_1(4, 23, 14); + if ((active0 & 0x400000L) != 0L) + return jjStartNfaWithStates_1(4, 22, 14); break; 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) { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0x200000000000000L); + return jjMoveStringLiteralDfa6_1(active0, 0x100000000000000L); case 67: case 99: - if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_1(5, 31, 14); + if ((active0 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(5, 30, 14); break; case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x20014000000L); + return jjMoveStringLiteralDfa6_1(active0, 0x1000a000000L); case 69: case 101: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 59, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x4000000000000000L); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 58, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L); case 70: case 102: - if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_1(5, 21, 14); + if ((active0 & 0x100000L) != 0L) + return jjStartNfaWithStates_1(5, 20, 14); break; case 71: case 103: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 54, 14); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 53, 14); break; case 72: case 104: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 49, 14); + if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 48, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x20000000040000L); + return jjMoveStringLiteralDfa6_1(active0, 0x10000000020000L); case 76: case 108: - if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_1(5, 30, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x8000000000L); + if ((active0 & 0x20000000L) != 0L) + return jjStartNfaWithStates_1(5, 29, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L); case 78: case 110: - if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_1(5, 47, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L); + if ((active0 & 0x400000000000L) != 0L) + return jjStartNfaWithStates_1(5, 46, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x2000000000L); case 82: case 114: - return jjMoveStringLiteralDfa6_1(active0, 0x28000000L); + return jjMoveStringLiteralDfa6_1(active0, 0x14000000L); case 84: case 116: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 55, 14); + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 54, 14); break; 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) { case 69: case 101: - if ((active0 & 0x4000000L) != 0L) + if ((active0 & 0x2000000L) != 0L) { - jjmatchedKind = 26; + jjmatchedKind = 25; jjmatchedPos = 6; } - else if ((active0 & 0x8000000L) != 0L) + else if ((active0 & 0x4000000L) != 0L) { - jjmatchedKind = 27; + jjmatchedKind = 26; jjmatchedPos = 6; } - return jjMoveStringLiteralDfa7_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa7_1(active0, 0x18000000L); case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x20000000000000L); + return jjMoveStringLiteralDfa7_1(active0, 0x10000000000000L); case 78: case 110: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 57, 14); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 56, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa7_1(active0, 0x40000L); + return jjMoveStringLiteralDfa7_1(active0, 0x20000L); case 82: case 114: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 62, 14); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 61, 14); break; case 83: case 115: - if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_1(6, 41, 14); + if ((active0 & 0x10000000000L) != 0L) + return jjStartNfaWithStates_1(6, 40, 14); break; case 84: case 116: - if ((active0 & 0x8000000000L) != 0L) - return jjStartNfaWithStates_1(6, 39, 14); + if ((active0 & 0x4000000000L) != 0L) + return jjStartNfaWithStates_1(6, 38, 14); break; case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x4000000000L); + return jjMoveStringLiteralDfa7_1(active0, 0x2000000000L); 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) { case 95: - return jjMoveStringLiteralDfa8_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x18000000L); case 69: case 101: - if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_1(7, 38, 14); - else if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_1(7, 53, 14); + if ((active0 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_1(7, 37, 14); + else if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 52, 14); break; case 78: case 110: - if ((active0 & 0x40000L) != 0L) - return jjStartNfaWithStates_1(7, 18, 14); + if ((active0 & 0x20000L) != 0L) + return jjStartNfaWithStates_1(7, 17, 14); break; 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) { case 79: case 111: - return jjMoveStringLiteralDfa9_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa9_1(active0, 0x18000000L); 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) { case 78: case 110: - return jjMoveStringLiteralDfa10_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa10_1(active0, 0x18000000L); 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) { case 67: case 99: - return jjMoveStringLiteralDfa11_1(active0, 0x30000000L); + return jjMoveStringLiteralDfa11_1(active0, 0x18000000L); 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) { case 69: case 101: - if ((active0 & 0x10000000L) != 0L) + if ((active0 & 0x8000000L) != 0L) + return jjStartNfaWithStates_1(11, 27, 14); + else if ((active0 & 0x10000000L) != 0L) return jjStartNfaWithStates_1(11, 28, 14); - else if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_1(11, 29, 14); break; default : break; } - return jjStartNfa_1(10, active0, 0L); + return jjStartNfa_1(10, active0, 0L, 0L); } static final long[] jjbitVec0 = { 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL @@ -1158,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; @@ -1175,11 +1227,11 @@ static private final int jjMoveNfa_1(int startState, int curPos) { case 3: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(0, 6); + jjCheckNAddStates(2, 8); else if (curChar == 39) - jjCheckNAddStates(7, 10); + jjCheckNAddStates(9, 14); else if (curChar == 34) - jjCheckNAddStates(11, 16); + jjCheckNAddStates(15, 20); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1188,15 +1240,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 65) - kind = 65; + if (kind > 64) + kind = 64; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 65) - kind = 65; - jjCheckNAddStates(17, 19); + if (kind > 64) + kind = 64; + jjCheckNAddStates(21, 23); } break; case 0: @@ -1204,8 +1256,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if ((0xffff7fffffffffffL & l) != 0L && kind > 11) - kind = 11; + if ((0xffff7fffffffffffL & l) != 0L && kind > 10) + kind = 10; break; case 2: if (curChar == 42) @@ -1214,15 +1266,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 65) - kind = 65; + if (kind > 64) + kind = 64; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 65) - kind = 65; + if (kind > 64) + kind = 64; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1232,9 +1284,9 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; - jjCheckNAddStates(20, 22); + if (kind > 68) + kind = 68; + jjCheckNAddStates(24, 26); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1243,15 +1295,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; + if (kind > 68) + kind = 68; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 74) + kind = 74; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1261,13 +1313,13 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 127) - kind = 127; + if (kind > 128) + kind = 128; jjstateSet[jjnewStateCnt++] = 17; break; case 18: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(0, 6); + jjCheckNAddStates(2, 8); break; case 19: if ((0x3ff000000000000L & l) != 0L) @@ -1276,16 +1328,16 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 69) - kind = 69; - jjCheckNAddStates(23, 25); + if (kind > 68) + kind = 68; + jjCheckNAddStates(27, 29); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; - jjCheckNAddStates(23, 25); + if (kind > 68) + kind = 68; + jjCheckNAddStates(27, 29); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1294,8 +1346,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; + if (kind > 68) + kind = 68; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1309,13 +1361,13 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 69) - kind = 69; + if (kind > 68) + kind = 68; jjCheckNAddTwoStates(28, 12); break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(26, 28); + jjCheckNAddStates(30, 32); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1328,77 +1380,85 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 65) - kind = 65; - jjCheckNAddStates(17, 19); + if (kind > 64) + kind = 64; + jjCheckNAddStates(21, 23); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 65) - kind = 65; + if (kind > 64) + kind = 64; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 65) - kind = 65; + if (kind > 64) + kind = 64; jjCheckNAddTwoStates(36, 6); break; case 37: if (curChar == 34) - jjCheckNAddStates(11, 16); + jjCheckNAddStates(15, 20); break; case 38: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(29, 31); + jjCheckNAddStates(33, 35); break; case 39: if (curChar == 34) - jjCheckNAddStates(29, 31); + jjCheckNAddStates(33, 35); break; case 41: - if (curChar == 34 && kind > 71) - kind = 71; + if (curChar == 34 && kind > 70) + kind = 70; break; case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(32, 34); + jjCheckNAddStates(36, 38); break; case 43: if (curChar == 34) - jjCheckNAddStates(32, 34); + jjCheckNAddStates(36, 38); break; case 45: - if (curChar == 34 && kind > 72) - kind = 72; + if (curChar == 34 && kind > 71) + kind = 71; break; case 46: if (curChar == 39) - jjCheckNAddStates(7, 10); + jjCheckNAddStates(9, 14); break; case 47: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddTwoStates(47, 48); + jjCheckNAddStates(39, 41); break; case 48: - if (curChar == 39 && kind > 71) - kind = 71; - break; - case 49: - if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddTwoStates(49, 50); + if (curChar == 39) + jjCheckNAddStates(39, 41); break; case 50: - if (curChar == 39 && kind > 73) - kind = 73; + if (curChar == 39 && kind > 70) + kind = 70; + break; + case 51: + if ((0xffffff7fffffffffL & l) != 0L) + jjCheckNAddStates(42, 44); break; case 52: - jjAddStates(35, 36); + if (curChar == 39) + jjCheckNAddStates(42, 44); break; case 54: - jjAddStates(37, 38); + if (curChar == 39 && kind > 72) + kind = 72; + break; + case 56: + jjAddStates(45, 47); + break; + case 60: + jjAddStates(48, 50); break; default : break; } @@ -1412,58 +1472,58 @@ 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 > 75) - kind = 75; + if (kind > 74) + kind = 74; jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(39, 42); + jjCheckNAddStates(51, 56); break; case 1: - if (kind > 11) - kind = 11; + if (kind > 10) + kind = 10; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 65) - kind = 65; + if ((0x100000001000L & l) != 0L && kind > 64) + kind = 64; break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(43, 44); + jjAddStates(57, 58); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 69) - kind = 69; + if ((0x5000000050L & l) != 0L && kind > 68) + kind = 68; break; case 13: case 14: - if ((0x7fffffe87fffffeL & l) == 0L) + if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 74) + kind = 74; jjCheckNAdd(14); break; case 16: case 17: - if ((0x7fffffe87fffffeL & l) == 0L) + if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 127) - kind = 127; + if (kind > 128) + kind = 128; jjCheckNAdd(17); break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(45, 46); + jjAddStates(59, 60); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(47, 48); + jjAddStates(61, 62); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(49, 50); + jjAddStates(63, 64); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1472,49 +1532,73 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 65) - kind = 65; + if (kind > 64) + kind = 64; jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(29, 31); + jjAddStates(33, 35); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; case 42: - jjAddStates(32, 34); + jjAddStates(36, 38); break; case 44: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 43; break; case 47: - jjAddStates(51, 52); + jjAddStates(39, 41); break; case 49: - jjAddStates(53, 54); + 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(39, 42); + jjCheckNAddStates(51, 56); break; - case 52: + case 56: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddTwoStates(52, 53); + jjCheckNAddStates(45, 47); break; - case 53: - if (curChar == 96 && kind > 71) - kind = 71; + case 57: + if (curChar == 96) + jjCheckNAddStates(45, 47); break; - case 54: + case 58: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 57; + break; + case 59: + if (curChar == 96 && kind > 70) + kind = 70; + break; + case 60: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddTwoStates(54, 55); + jjCheckNAddStates(48, 50); break; - case 55: - if (curChar == 96 && kind > 74) - kind = 74; + 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; default : break; } @@ -1528,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 > 11) - kind = 11; + 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(29, 31); + jjAddStates(33, 35); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(32, 34); + jjAddStates(36, 38); break; case 47: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(51, 52); + jjAddStates(39, 41); break; - case 49: + case 51: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(53, 54); + jjAddStates(42, 44); break; - case 52: + case 56: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(35, 36); + jjAddStates(45, 47); break; - case 54: + case 60: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 38); + jjAddStates(48, 50); break; default : break; } @@ -1567,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; } @@ -1578,7 +1678,7 @@ static private final int jjMoveStringLiteralDfa0_3() switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_3(0x4000L); + return jjMoveStringLiteralDfa1_3(0x2000L); default : return 1; } @@ -1592,8 +1692,8 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) switch(curChar) { case 47: - if ((active0 & 0x4000L) != 0L) - return jjStopAtPos(1, 14); + if ((active0 & 0x2000L) != 0L) + return jjStopAtPos(1, 13); break; default : return 2; @@ -1601,24 +1701,25 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) return 2; } static final int[] jjnextStates = { - 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, "\74\77", null, null, null, null, null, null, null, null, null, null, +"", null, "\77\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, "\55\76", "\72\72", "\75\76", 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, "\50", -"\51", "\173", "\175", "\133", "\135", "\73", "\54", "\56", "\100", "\44", "\75", -"\76", "\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", }; +null, null, null, null, null, null, null, null, null, null, null, "\50", "\51", +"\173", "\175", "\133", "\135", "\73", "\54", "\56", "\100", "\44", "\75", "\76", +"\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", "\41\75\75", +"\75\75\75", "\176\75", null, "\77\76", }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", @@ -1627,28 +1728,28 @@ public static final String[] lexStateNames = { "IN_MULTI_LINE_COMMENT", }; public static final int[] jjnewLexState = { - -1, 1, 1, -1, 0, -1, -1, -1, -1, -1, 2, 3, 4, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 3, 4, 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, -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 = { - 0xfffffffffffe0007L, 0xffffffffffff8fa3L, 0x1L, + 0xffffffffffff0007L, 0xffffffffffffc7d1L, 0x3L, }; static final long[] jjtoSkip = { - 0xe3f8L, 0x0L, 0x0L, + 0x71f8L, 0x0L, 0x0L, }; static final long[] jjtoSpecial = { - 0xe010L, 0x0L, 0x0L, + 0x7000L, 0x0L, 0x0L, }; static final long[] jjtoMore = { - 0x11c00L, 0x0L, 0x0L, + 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; @@ -1675,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) @@ -1691,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; @@ -1711,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; @@ -1762,27 +1863,27 @@ public static final Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - if (jjmatchedPos == 0 && jjmatchedKind > 16) + if (jjmatchedPos == 0 && jjmatchedKind > 15) { - jjmatchedKind = 16; + jjmatchedKind = 15; } break; case 3: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_3(); - if (jjmatchedPos == 0 && jjmatchedKind > 16) + if (jjmatchedPos == 0 && jjmatchedKind > 15) { - jjmatchedKind = 16; + jjmatchedKind = 15; } break; case 4: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_4(); - if (jjmatchedPos == 0 && jjmatchedKind > 16) + if (jjmatchedPos == 0 && jjmatchedKind > 15) { - jjmatchedKind = 16; + jjmatchedKind = 15; } break; } @@ -1853,7 +1954,7 @@ public static final Token getNextToken() } } -static final void SkipLexicalActions(Token matchedToken) +static void SkipLexicalActions(Token matchedToken) { switch(jjmatchedKind) { @@ -1861,12 +1962,12 @@ static final void SkipLexicalActions(Token matchedToken) break; } } -static final void MoreLexicalActions() +static void MoreLexicalActions() { jjimageLen += (lengthOfMatch = jjmatchedPos + 1); switch(jjmatchedKind) { - case 11 : + case 10 : if (image == null) image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen))); else