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 a5546f7..bffc8ef 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -6,16 +6,14 @@ 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.Enumeration; 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.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; +import net.sourceforge.phpdt.internal.compiler.parser.*; +import net.sourceforge.phpdt.internal.compiler.ast.*; public class PHPParserTokenManager implements PHPParserConstants { @@ -32,14 +30,12 @@ static private final int jjMoveStringLiteralDfa0_0() switch(curChar) { case 60: - return jjMoveStringLiteralDfa1_0(0xeL, 0x0L); - case 63: - return jjMoveStringLiteralDfa1_0(0x0L, 0x400L); + return jjMoveStringLiteralDfa1_0(0xeL); default : return 1; } } -static private final int jjMoveStringLiteralDfa1_0(long active0, long active2) +static private final int jjMoveStringLiteralDfa1_0(long active0) { try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -47,25 +43,20 @@ static private final int jjMoveStringLiteralDfa1_0(long active0, long active2) } switch(curChar) { - case 62: - if ((active2 & 0x400L) != 0L) - return jjStopAtPos(1, 138); - break; case 63: if ((active0 & 0x2L) != 0L) { jjmatchedKind = 1; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_0(active0, 0xcL, active2, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0xcL); default : return 2; } - return 2; } -static private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old2, long active2) +static private final int jjMoveStringLiteralDfa2_0(long old0, long active0) { - if (((active0 &= old0) | (active2 &= old2)) == 0L) + if (((active0 &= old0)) == 0L) return 2; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { @@ -127,7 +118,7 @@ static private final int jjMoveStringLiteralDfa0_4() switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_4(0x20000L); + return jjMoveStringLiteralDfa1_4(0x40000L); default : return 1; } @@ -141,8 +132,8 @@ static private final int jjMoveStringLiteralDfa1_4(long active0) switch(curChar) { case 47: - if ((active0 & 0x20000L) != 0L) - return jjStopAtPos(1, 17); + if ((active0 & 0x40000L) != 0L) + return jjStopAtPos(1, 18); break; default : return 2; @@ -174,7 +165,7 @@ static private final int jjMoveStringLiteralDfa0_2() switch(curChar) { case 63: - return jjMoveStringLiteralDfa1_2(0x8000L); + return jjMoveStringLiteralDfa1_2(0x10000L); default : return jjMoveNfa_2(0, 0); } @@ -189,8 +180,8 @@ static private final int jjMoveStringLiteralDfa1_2(long active0) switch(curChar) { case 62: - if ((active0 & 0x8000L) != 0L) - return jjStopAtPos(1, 15); + if ((active0 & 0x10000L) != 0L) + return jjStopAtPos(1, 16); break; default : break; @@ -249,15 +240,15 @@ static private final int jjMoveNfa_2(int startState, int curPos) case 0: if ((0x2400L & l) != 0L) { - if (kind > 14) - kind = 14; + if (kind > 15) + kind = 15; } if (curChar == 13) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if (curChar == 10 && kind > 14) - kind = 14; + if (curChar == 10 && kind > 15) + kind = 15; break; case 2: if (curChar == 13) @@ -308,122 +299,124 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x2800L) != 0L || (active1 & 0x8000100000000000L) != 0L) + if ((active0 & 0x4800L) != 0L || (active1 & 0x400000000000L) != 0L || (active2 & 0x4L) != 0L) return 2; - if ((active1 & 0x10000000000000L) != 0L) + if ((active1 & 0x40000000000000L) != 0L) return 16; - if ((active1 & 0x1000040000000L) != 0L) + if ((active1 & 0x4000100000000L) != 0L) return 8; - if ((active0 & 0xffffffc7fff80000L) != 0L || (active1 & 0xffL) != 0L) + if ((active0 & 0xffffff1ffff00000L) != 0L || (active1 & 0x3ffL) != 0L) { - jjmatchedKind = 82; + jjmatchedKind = 84; return 14; } return -1; case 1: - if ((active0 & 0x2000L) != 0L) - return 0; - if ((active0 & 0x1000080000400000L) != 0L || (active1 & 0x44L) != 0L) - return 14; - if ((active0 & 0xeffff7c7ffb80000L) != 0L || (active1 & 0xbbL) != 0L) + if ((active0 & 0xbfffef1fff700000L) != 0L || (active1 & 0x2efL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 1; } return 14; } + if ((active0 & 0x4000L) != 0L) + return 0; + if ((active0 & 0x4000100000800000L) != 0L || (active1 & 0x110L) != 0L) + return 14; return -1; case 2: - if ((active0 & 0x800a00000200000L) != 0L || (active1 & 0xb0L) != 0L) + if ((active0 & 0x2001400000400000L) != 0L || (active1 & 0x2c0L) != 0L) return 14; - if ((active0 & 0xe7ff57c7ff980000L) != 0L || (active1 & 0xfL) != 0L) + if ((active0 & 0x9ffeaf1fff300000L) != 0L || (active1 & 0x3fL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0x803140c011800000L) != 0L || (active1 & 0x3L) != 0L) + if ((active0 & 0x62810053000000L) != 0L || (active1 & 0xeL) != 0L) return 14; - if ((active0 & 0x6fce1707ee180000L) != 0L || (active1 & 0x2cL) != 0L) + if ((active0 & 0xbf9c2e1fac300000L) != 0L || (active1 & 0xb1L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0x6d0a1607e0900000L) != 0L || (active1 & 0x25L) != 0L) + if ((active0 & 0xb6142c1f81200000L) != 0L || (active1 & 0x95L) != 0L) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 4; return 14; } - if ((active0 & 0x2c401000e080000L) != 0L || (active1 & 0x8L) != 0L) + if ((active0 & 0x98802002c100000L) != 0L || (active1 & 0x20L) != 0L) return 14; return -1; case 5: - if ((active0 & 0x640a000600800000L) != 0L || (active1 & 0x4L) != 0L) + if ((active0 & 0x9014001801000000L) != 0L || (active1 & 0x11L) != 0L) return 14; - if ((active0 & 0x9001601e0100000L) != 0L || (active1 & 0x21L) != 0L) + if ((active0 & 0x26002c0780200000L) != 0L || (active1 & 0x84L) != 0L) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x8001401e0000000L) != 0L || (active1 & 0x21L) != 0L) + if ((active0 & 0x2000280780000000L) != 0L || (active1 & 0x84L) != 0L) return 14; - if ((active0 & 0x100020000100000L) != 0L) + if ((active0 & 0x600040000200000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 6; } return 14; } return -1; case 7: - if ((active0 & 0x180000000L) != 0L) + if ((active0 & 0x200040000200000L) != 0L) + return 14; + if ((active0 & 0x400000600000000L) != 0L) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 7; return 14; } - if ((active0 & 0x100020000100000L) != 0L) - return 14; return -1; case 8: - if ((active0 & 0x180000000L) != 0L) + if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 8; return 14; } + if ((active0 & 0x400000000000000L) != 0L) + return 14; return -1; case 9: - if ((active0 & 0x180000000L) != 0L) + if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 9; return 14; } return -1; case 10: - if ((active0 & 0x180000000L) != 0L) + if ((active0 & 0x600000000L) != 0L) { - jjmatchedKind = 82; + jjmatchedKind = 84; jjmatchedPos = 10; return 14; } @@ -449,123 +442,126 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 117; - return jjMoveStringLiteralDfa1_1(0x0L, 0x5000000000L, 0x0L); + jjmatchedKind = 119; + return jjMoveStringLiteralDfa1_1(0x0L, 0x14000000000L, 0x0L); + case 35: + return jjStopAtPos(0, 12); case 36: - return jjStartNfaWithStates_1(0, 116, 16); + return jjStartNfaWithStates_1(0, 118, 16); case 37: - jjmatchedKind = 131; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); + jjmatchedKind = 134; + return jjMoveStringLiteralDfa1_1(0x0L, 0x8000000000000L, 0x0L); case 38: - jjmatchedKind = 128; - return jjMoveStringLiteralDfa1_1(0x0L, 0x200200000000000L, 0x0L); + jjmatchedKind = 131; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1000800000000000L, 0x0L); case 40: - return jjStopAtPos(0, 86); + return jjStopAtPos(0, 88); case 41: - return jjStopAtPos(0, 87); + return jjStopAtPos(0, 89); case 42: - jjmatchedKind = 126; - return jjMoveStringLiteralDfa1_1(0x0L, 0x80000000000L, 0x0L); + jjmatchedKind = 129; + return jjMoveStringLiteralDfa1_1(0x0L, 0x200000000000L, 0x0L); case 43: - jjmatchedKind = 124; - return jjMoveStringLiteralDfa1_1(0x0L, 0x400020000000000L, 0x0L); + jjmatchedKind = 127; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000080000000000L, 0x0L); case 44: - return jjStopAtPos(0, 93); + return jjStopAtPos(0, 95); case 45: - jjmatchedKind = 125; - return jjMoveStringLiteralDfa1_1(0x800000000L, 0x800040000000000L, 0x0L); + jjmatchedKind = 128; + return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x4000100000000000L, 0x0L); case 46: - jjmatchedKind = 94; - return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000000000L, 0x0L); + jjmatchedKind = 96; + return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L); case 47: - jjmatchedKind = 127; - return jjMoveStringLiteralDfa1_1(0x2800L, 0x100000000000L, 0x0L); + jjmatchedKind = 130; + return jjMoveStringLiteralDfa1_1(0x4800L, 0x400000000000L, 0x0L); case 58: - jjmatchedKind = 119; - return jjMoveStringLiteralDfa1_1(0x1000000000L, 0x0L, 0x0L); + jjmatchedKind = 122; + return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 92); + return jjStopAtPos(0, 94); case 60: - jjmatchedKind = 96; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2400000000L, 0x90L); + jjmatchedKind = 98; + return jjMoveStringLiteralDfa1_1(0x0L, 0x9000000000L, 0x480L); case 61: - jjmatchedKind = 104; - return jjMoveStringLiteralDfa1_1(0x2000000000L, 0x8200000000L, 0x0L); + jjmatchedKind = 106; + return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x20800000000L, 0x0L); case 62: - jjmatchedKind = 95; - return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000L, 0x160L); + jjmatchedKind = 97; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000L, 0xb00L); case 63: - jjmatchedKind = 118; + jjmatchedKind = 121; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 115); + return jjStopAtPos(0, 117); case 91: - return jjStopAtPos(0, 90); + return jjStopAtPos(0, 92); case 93: - return jjStopAtPos(0, 91); + return jjStopAtPos(0, 93); case 94: - jjmatchedKind = 130; - return jjMoveStringLiteralDfa1_1(0x0L, 0x800000000000L, 0x0L); + jjmatchedKind = 133; + return jjMoveStringLiteralDfa1_1(0x0L, 0x2000000000000L, 0x0L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x1000000002000000L, 0x80L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4000000004000000L, 0x200L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x8000000004000000L, 0x1L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000000L, 0x6L, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0x38000080000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x70000100000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0xc0000000000L, 0x4L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x180000000000L, 0x10L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x700100011800000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1e00200043000000L, 0x0L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x840200000100000L, 0x8L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x2080400000200000L, 0x20L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x400200000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x800800000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0xa0400000L, 0x30L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x280800000L, 0xc0L, 0x0L); case 76: case 108: - return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x10000000L, 0x0L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0x1800000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x3000000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x4000000000000000L, 0x40L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x101L, 0x0L); case 80: case 112: - return jjMoveStringLiteralDfa1_1(0x8000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x2000140000000L, 0x2L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x4000500000000L, 0x8L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x200c000400000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8018001000000000L, 0x0L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0x30000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x60000000000000L, 0x0L, 0x0L); case 86: case 118: - return jjMoveStringLiteralDfa1_1(0x200000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x400000L, 0x0L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x80000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x100000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 88); + return jjStopAtPos(0, 90); case 124: - jjmatchedKind = 129; - return jjMoveStringLiteralDfa1_1(0x0L, 0x100400000000000L, 0x0L); + jjmatchedKind = 132; + return jjMoveStringLiteralDfa1_1(0x0L, 0x801000000000000L, 0x0L); case 125: - return jjStopAtPos(0, 89); + return jjStopAtPos(0, 91); case 126: - return jjMoveStringLiteralDfa1_1(0x0L, 0x4000000000000L, 0x0L); + jjmatchedKind = 120; + return jjMoveStringLiteralDfa1_1(0x0L, 0x10000000000000L, 0x0L); default : return jjMoveNfa_1(3, 0); } @@ -580,55 +576,51 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x200000000000000L) != 0L) - return jjStopAtPos(1, 121); + if ((active1 & 0x1000000000000000L) != 0L) + return jjStopAtPos(1, 124); break; case 42: - if ((active0 & 0x2000L) != 0L) - return jjStartNfaWithStates_1(1, 13, 0); + if ((active0 & 0x4000L) != 0L) + return jjStartNfaWithStates_1(1, 14, 0); break; case 43: - if ((active1 & 0x400000000000000L) != 0L) - return jjStopAtPos(1, 122); + if ((active1 & 0x2000000000000000L) != 0L) + return jjStopAtPos(1, 125); break; case 45: - if ((active1 & 0x800000000000000L) != 0L) - return jjStopAtPos(1, 123); + if ((active1 & 0x4000000000000000L) != 0L) + return jjStopAtPos(1, 126); break; case 47: if ((active0 & 0x800L) != 0L) return jjStopAtPos(1, 11); break; case 58: - if ((active0 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 36); + if ((active0 & 0x4000000000L) != 0L) + return jjStopAtPos(1, 38); break; case 60: - if ((active2 & 0x10L) != 0L) + if ((active2 & 0x80L) != 0L) { - jjmatchedKind = 132; + jjmatchedKind = 135; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x80L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x400L); case 61: - if ((active1 & 0x200000000L) != 0L) + if ((active1 & 0x800000000L) != 0L) { - jjmatchedKind = 97; + jjmatchedKind = 99; jjmatchedPos = 1; } - else if ((active1 & 0x400000000L) != 0L) - return jjStopAtPos(1, 98); - else if ((active1 & 0x800000000L) != 0L) - return jjStopAtPos(1, 99); else if ((active1 & 0x1000000000L) != 0L) + return jjStopAtPos(1, 100); + else if ((active1 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 101); + else if ((active1 & 0x4000000000L) != 0L) { - jjmatchedKind = 100; + jjmatchedKind = 102; jjmatchedPos = 1; } - else if ((active1 & 0x20000000000L) != 0L) - return jjStopAtPos(1, 105); - else if ((active1 & 0x40000000000L) != 0L) - return jjStopAtPos(1, 106); else if ((active1 & 0x80000000000L) != 0L) return jjStopAtPos(1, 107); else if ((active1 & 0x100000000000L) != 0L) @@ -645,84 +637,88 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 113); else if ((active1 & 0x4000000000000L) != 0L) return jjStopAtPos(1, 114); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0xc000000000L, active2, 0L); + 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); case 62: if ((active0 & 0x10L) != 0L) return jjStopAtPos(1, 4); - else if ((active0 & 0x800000000L) != 0L) - return jjStopAtPos(1, 35); else if ((active0 & 0x2000000000L) != 0L) return jjStopAtPos(1, 37); - else if ((active1 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 101); - else if ((active2 & 0x20L) != 0L) + else if ((active0 & 0x8000000000L) != 0L) + return jjStopAtPos(1, 39); + else if ((active1 & 0x8000000000L) != 0L) + return jjStopAtPos(1, 103); + else if ((active2 & 0x100L) != 0L) { - jjmatchedKind = 133; + jjmatchedKind = 136; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x140L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0xa00L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x40008000200000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x80010000400000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0x4000000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x1L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0x2840140000000L, active1, 0x2L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x5080500000000L, active1, 0x8L, active2, 0L); case 70: case 102: - if ((active0 & 0x400000L) != 0L) - return jjStartNfaWithStates_1(1, 22, 14); + if ((active0 & 0x800000L) != 0L) + return jjStartNfaWithStates_1(1, 23, 14); break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x90000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x120000000000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_1(active0, 0x4000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x201880000L, active1, 0x8L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x803100000L, active1, 0x20L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x7000000a0000000L, active1, 0xb0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1e00000280000000L, active1, 0x2c0L, active2, 0L); case 79: case 111: - if ((active0 & 0x80000000000L) != 0L) + if ((active0 & 0x100000000000L) != 0L) { - jjmatchedKind = 43; + jjmatchedKind = 44; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0x8800630000000000L, active1, 0x5L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x2000c60000000000L, active1, 0x16L, active2, 0L); case 82: case 114: - if ((active1 & 0x40L) != 0L) - return jjStartNfaWithStates_1(1, 70, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x2000000e000000L, active1, 0L, active2, 0L); + if ((active1 & 0x100L) != 0L) + return jjStartNfaWithStates_1(1, 72, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x4000002c000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 60, 14); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(1, 62, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x2000000400000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x8000001000000000L, active1, 0L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0x5000000100000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0xa000000200000L, active1, 0L, active2, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x8000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x10000000000000L, active1, 0L, active2, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x100000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x200000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x100000000000000L) != 0L) - return jjStopAtPos(1, 120); + if ((active1 & 0x800000000000000L) != 0L) + return jjStopAtPos(1, 123); break; default : break; @@ -741,88 +737,88 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x4000000000L) != 0L) - return jjStopAtPos(2, 102); - else if ((active1 & 0x8000000000L) != 0L) - return jjStopAtPos(2, 103); - else if ((active2 & 0x80L) != 0L) - return jjStopAtPos(2, 135); - else if ((active2 & 0x100L) != 0L) - return jjStopAtPos(2, 136); + if ((active1 & 0x10000000000L) != 0L) + return jjStopAtPos(2, 104); + else if ((active1 & 0x20000000000L) != 0L) + return jjStopAtPos(2, 105); + else if ((active2 & 0x400L) != 0L) + return jjStopAtPos(2, 138); + else if ((active2 & 0x800L) != 0L) + return jjStopAtPos(2, 139); break; case 62: - if ((active2 & 0x40L) != 0L) - return jjStopAtPos(2, 134); + if ((active2 & 0x200L) != 0L) + return jjStopAtPos(2, 137); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x400080000L, active1, 0x2L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1000100000L, active1, 0x8L, active2, 0L); case 67: case 99: - return jjMoveStringLiteralDfa3_1(active0, 0xa0000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x280000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x80L) != 0L) - return jjStartNfaWithStates_1(2, 71, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x700000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x200L) != 0L) + return jjStartNfaWithStates_1(2, 73, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x1e00000000000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa3_1(active0, 0x4000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8000000L, active1, 0L, active2, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x40000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x80000000000L, active1, 0L, active2, 0L); case 72: case 104: - return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x98000008000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x130000020000000L, active1, 0L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x1L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x41000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x82000000000000L, active1, 0L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0x30000100000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x60000200000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x8000000200000000L, active1, 0x9L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x800000000L, active1, 0x26L, active2, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x4000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8000000000000L, active1, 0L, active2, 0L); case 81: case 113: - return jjMoveStringLiteralDfa3_1(active0, 0x140000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L); case 82: case 114: - if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_1(2, 21, 14); - else if ((active0 & 0x200000000000L) != 0L) + if ((active0 & 0x400000L) != 0L) + return jjStartNfaWithStates_1(2, 22, 14); + else if ((active0 & 0x400000000000L) != 0L) { - jjmatchedKind = 45; + jjmatchedKind = 46; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x2800000002000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0xa000000004000000L, active1, 0L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0xc001800000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x10013000000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x10L) != 0L) + if ((active1 & 0x40L) != 0L) { - jjmatchedKind = 68; + jjmatchedKind = 70; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x2500000000000L, active1, 0x20L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4a00000000000L, active1, 0x80L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0x4L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40000000000000L, active1, 0x10L, active2, 0L); case 87: case 119: - if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_1(2, 47, 14); + if ((active0 & 0x1000000000000L) != 0L) + return jjStartNfaWithStates_1(2, 48, 14); break; default : break; @@ -842,69 +838,69 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x40006000000L, active1, 0x8L); + return jjMoveStringLiteralDfa4_1(active0, 0x8000c000000L, active1, 0x20L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x200000000L, active1, 0x4L); + return jjMoveStringLiteralDfa4_1(active0, 0x800000000L, active1, 0x10L); case 67: case 99: - return jjMoveStringLiteralDfa4_1(active0, 0x100000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x200000L, active1, 0L); case 69: case 101: - if ((active0 & 0x1000000L) != 0L) + if ((active0 & 0x2000000L) != 0L) { - jjmatchedKind = 24; + jjmatchedKind = 25; jjmatchedPos = 3; } - else if ((active0 & 0x8000000000L) != 0L) - return jjStartNfaWithStates_1(3, 39, 14); - else if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 53, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x4804100000800000L, active1, 0x20L); + else if ((active0 & 0x10000000000L) != 0L) + return jjStartNfaWithStates_1(3, 40, 14); + else if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 54, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x2008200001000000L, active1, 0x81L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x2200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x8800000000000000L, active1, 0L); case 76: case 108: - if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 48, 14); - else if ((active0 & 0x8000000000000000L) != 0L) + if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 49, 14); + else if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 63; + jjmatchedKind = 65; jjmatchedPos = 3; } - else if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_1(3, 65, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x800000a0000000L, active1, 0x1L); + else if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_1(3, 67, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x100000280000000L, active1, 0x4L); case 78: case 110: - return jjMoveStringLiteralDfa4_1(active0, 0x8000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x20000000L, active1, 0L); case 79: case 111: - if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_1(3, 28, 14); - else if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_1(3, 46, 14); + if ((active0 & 0x40000000L) != 0L) + return jjStartNfaWithStates_1(3, 30, 14); + else if ((active0 & 0x800000000000L) != 0L) + return jjStartNfaWithStates_1(3, 47, 14); break; case 83: case 115: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 52, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x40010000080000L, active1, 0L); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 53, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x480020000100000L, active1, 0L); case 84: case 116: - if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_1(3, 38, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x8020400000000L, active1, 0L); + if ((active0 & 0x10000000L) != 0L) + return jjStartNfaWithStates_1(3, 28, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x10041000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x2000140000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x4000500000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x200000000000000L, active1, 0L); default : break; } @@ -923,71 +919,74 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x800000200000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x2000000800000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x4008000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0x1L); case 69: case 101: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 54, 14); - else if ((active0 & 0x80000000000000L) != 0L) + if ((active0 & 0x80000000000000L) != 0L) return jjStartNfaWithStates_1(4, 55, 14); - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x1L); + else if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 56, 14); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); case 70: case 102: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 57, 14); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 59, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x20L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x80L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x200000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x20540800000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x41501000000L, active1, 0L); case 75: case 107: - if ((active0 & 0x4000000L) != 0L) - return jjStartNfaWithStates_1(4, 26, 14); + if ((active0 & 0x8000000L) != 0L) + return jjStartNfaWithStates_1(4, 27, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x4L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x2000100000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x8000200000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 50, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000L, active1, 0L); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 51, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000L, active1, 0L); case 83: case 115: - if ((active0 & 0x80000L) != 0L) - return jjStartNfaWithStates_1(4, 19, 14); + if ((active0 & 0x100000L) != 0L) + return jjStartNfaWithStates_1(4, 20, 14); break; case 84: case 116: - if ((active0 & 0x8000000L) != 0L) - return jjStartNfaWithStates_1(4, 27, 14); - else if ((active0 & 0x10000000000L) != 0L) - return jjStartNfaWithStates_1(4, 40, 14); - else if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_1(4, 67, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x100000L, active1, 0L); + if ((active0 & 0x20000000L) != 0L) + return jjStartNfaWithStates_1(4, 29, 14); + else if ((active0 & 0x20000000000L) != 0L) + return jjStartNfaWithStates_1(4, 41, 14); + else if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(4, 69, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x200000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x400a0000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x80280000000L, active1, 0L); + case 87: + case 119: + return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); case 89: case 121: - if ((active0 & 0x2000000L) != 0L) - return jjStartNfaWithStates_1(4, 25, 14); + if ((active0 & 0x4000000L) != 0L) + return jjStartNfaWithStates_1(4, 26, 14); break; default : break; @@ -1007,57 +1006,57 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x1L); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x4L); case 67: case 99: - if ((active0 & 0x400000000L) != 0L) - return jjStartNfaWithStates_1(5, 34, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x800000000000000L, active1, 0L); + if ((active0 & 0x1000000000L) != 0L) + return jjStartNfaWithStates_1(5, 36, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x2000000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x1000a0000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x200280000000L, active1, 0L); case 69: case 101: - if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_1(5, 66, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x20L); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(5, 68, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x80L); case 70: case 102: - if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_1(5, 23, 14); + if ((active0 & 0x1000000L) != 0L) + return jjStartNfaWithStates_1(5, 24, 14); break; case 71: case 103: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 61, 14); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 63, 14); break; case 72: case 104: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 51, 14); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 52, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0x100000000100000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x600000000200000L, active1, 0L); case 76: case 108: - if ((active0 & 0x200000000L) != 0L) - return jjStartNfaWithStates_1(5, 33, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L); + if ((active0 & 0x800000000L) != 0L) + return jjStartNfaWithStates_1(5, 35, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 49, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x20000000000L, active1, 0L); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 50, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x40000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 58, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x140000000L, active1, 0L); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 60, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x500000000L, active1, 0L); case 84: case 116: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 62, 14); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(5, 64, 14); break; default : break; @@ -1077,51 +1076,51 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long { case 69: case 101: - if ((active0 & 0x20000000L) != 0L) + if ((active0 & 0x80000000L) != 0L) { - jjmatchedKind = 29; + jjmatchedKind = 31; jjmatchedPos = 6; } - else if ((active0 & 0x40000000L) != 0L) + else if ((active0 & 0x100000000L) != 0L) { - jjmatchedKind = 30; + jjmatchedKind = 32; jjmatchedPos = 6; } - return jjMoveStringLiteralDfa7_1(active0, 0x180000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x600000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 59, 14); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 61, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x200000000000000L, active1, 0L); case 78: case 110: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(6, 64, 14); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_1(6, 66, 14); break; case 79: case 111: - return jjMoveStringLiteralDfa7_1(active0, 0x100000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x200000L, active1, 0L); case 82: case 114: - if ((active1 & 0x20L) != 0L) - return jjStartNfaWithStates_1(6, 69, 14); + if ((active1 & 0x80L) != 0L) + return jjStartNfaWithStates_1(6, 71, 14); break; case 83: case 115: - if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_1(6, 44, 14); + if ((active0 & 0x200000000000L) != 0L) + return jjStartNfaWithStates_1(6, 45, 14); break; case 84: case 116: - if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_1(6, 42, 14); - break; + if ((active0 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_1(6, 43, 14); + return jjMoveStringLiteralDfa7_1(active0, 0x400000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x20000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x40000000000L, active1, 0L); default : break; } @@ -1139,18 +1138,21 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long switch(curChar) { case 95: - return jjMoveStringLiteralDfa8_1(active0, 0x180000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x600000000L); + case 67: + case 99: + return jjMoveStringLiteralDfa8_1(active0, 0x400000000000000L); case 69: case 101: - if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_1(7, 41, 14); - else if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_1(7, 56, 14); + if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_1(7, 42, 14); + else if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 57, 14); break; case 78: case 110: - if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_1(7, 20, 14); + if ((active0 & 0x200000L) != 0L) + return jjStartNfaWithStates_1(7, 21, 14); break; default : break; @@ -1168,9 +1170,14 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) } switch(curChar) { + case 72: + case 104: + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(8, 58, 14); + break; case 79: case 111: - return jjMoveStringLiteralDfa9_1(active0, 0x180000000L); + return jjMoveStringLiteralDfa9_1(active0, 0x600000000L); default : break; } @@ -1189,7 +1196,7 @@ static private final int jjMoveStringLiteralDfa9_1(long old0, long active0) { case 78: case 110: - return jjMoveStringLiteralDfa10_1(active0, 0x180000000L); + return jjMoveStringLiteralDfa10_1(active0, 0x600000000L); default : break; } @@ -1208,7 +1215,7 @@ static private final int jjMoveStringLiteralDfa10_1(long old0, long active0) { case 67: case 99: - return jjMoveStringLiteralDfa11_1(active0, 0x180000000L); + return jjMoveStringLiteralDfa11_1(active0, 0x600000000L); default : break; } @@ -1227,10 +1234,10 @@ static private final int jjMoveStringLiteralDfa11_1(long old0, long active0) { case 69: case 101: - if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_1(11, 31, 14); - else if ((active0 & 0x100000000L) != 0L) - return jjStartNfaWithStates_1(11, 32, 14); + if ((active0 & 0x200000000L) != 0L) + return jjStartNfaWithStates_1(11, 33, 14); + else if ((active0 & 0x400000000L) != 0L) + return jjStartNfaWithStates_1(11, 34, 14); break; default : break; @@ -1244,7 +1251,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 64; + jjnewStateCnt = 70; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -1265,7 +1272,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) else if (curChar == 39) jjCheckNAddStates(7, 12); else if (curChar == 34) - jjCheckNAddStates(13, 18); + jjCheckNAddStates(13, 20); else if (curChar == 36) jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) @@ -1274,15 +1281,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 72) - kind = 72; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 72) - kind = 72; - jjCheckNAddStates(19, 21); + if (kind > 74) + kind = 74; + jjCheckNAddStates(21, 23); } break; case 0: @@ -1290,8 +1297,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 1; break; case 1: - if ((0xffff7fffffffffffL & l) != 0L && kind > 12) - kind = 12; + if ((0xffff7fffffffffffL & l) != 0L && kind > 13) + kind = 13; break; case 2: if (curChar == 42) @@ -1300,15 +1307,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 72) - kind = 72; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 72) - kind = 72; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1318,9 +1325,9 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 76) - kind = 76; - jjCheckNAddStates(22, 24); + if (kind > 78) + kind = 78; + jjCheckNAddStates(24, 26); break; case 10: if ((0x280000000000L & l) != 0L) @@ -1329,15 +1336,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 76) - kind = 76; + if (kind > 78) + kind = 78; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 82) - kind = 82; + if (kind > 84) + kind = 84; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1347,8 +1354,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 137) - kind = 137; + if (kind > 140) + kind = 140; jjstateSet[jjnewStateCnt++] = 17; break; case 18: @@ -1362,16 +1369,16 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 76) - kind = 76; - jjCheckNAddStates(25, 27); + if (kind > 78) + kind = 78; + jjCheckNAddStates(27, 29); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 76) - kind = 76; - jjCheckNAddStates(25, 27); + if (kind > 78) + kind = 78; + jjCheckNAddStates(27, 29); break; case 23: if ((0x280000000000L & l) != 0L) @@ -1380,8 +1387,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 76) - kind = 76; + if (kind > 78) + kind = 78; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1395,13 +1402,13 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 76) - kind = 76; + if (kind > 78) + kind = 78; jjCheckNAddTwoStates(28, 12); break; case 29: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(28, 30); + jjCheckNAddStates(30, 32); break; case 31: if ((0x280000000000L & l) != 0L) @@ -1414,85 +1421,93 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 72) - kind = 72; - jjCheckNAddStates(19, 21); + if (kind > 74) + kind = 74; + jjCheckNAddStates(21, 23); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 72) - kind = 72; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 72) - kind = 72; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(36, 6); break; case 37: if (curChar == 34) - jjCheckNAddStates(13, 18); + jjCheckNAddStates(13, 20); break; case 38: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(31, 33); + jjCheckNAddStates(33, 36); break; case 39: if (curChar == 34) - jjCheckNAddStates(31, 33); - break; - case 41: - if (curChar == 34 && kind > 78) - kind = 78; + jjCheckNAddStates(33, 36); break; case 42: if ((0xfffffffbffffffffL & l) != 0L) - jjCheckNAddStates(34, 36); + jjstateSet[jjnewStateCnt++] = 43; break; - case 43: - if (curChar == 34) - jjCheckNAddStates(34, 36); + case 44: + if (curChar == 34 && kind > 80) + kind = 80; break; case 45: - if (curChar == 34 && kind > 79) - kind = 79; + if ((0xfffffffbffffffffL & l) != 0L) + jjCheckNAddStates(37, 40); break; case 46: + if (curChar == 34) + jjCheckNAddStates(37, 40); + break; + case 49: + if ((0xfffffffbffffffffL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 50; + break; + case 51: + if (curChar == 34 && kind > 81) + kind = 81; + break; + case 52: if (curChar == 39) jjCheckNAddStates(7, 12); break; - case 47: + case 53: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(37, 39); + jjCheckNAddStates(41, 43); break; - case 48: + case 54: if (curChar == 39) - jjCheckNAddStates(37, 39); + jjCheckNAddStates(41, 43); break; - case 50: - if (curChar == 39 && kind > 78) - kind = 78; + case 56: + if (curChar == 39 && kind > 80) + kind = 80; break; - case 51: + case 57: if ((0xffffff7fffffffffL & l) != 0L) - jjCheckNAddStates(40, 42); + jjCheckNAddStates(44, 46); break; - case 52: + case 58: if (curChar == 39) - jjCheckNAddStates(40, 42); + jjCheckNAddStates(44, 46); break; - case 54: - if (curChar == 39 && kind > 80) - kind = 80; + case 60: + if (curChar == 39 && kind > 82) + kind = 82; break; - case 56: - jjAddStates(43, 45); + case 62: + jjAddStates(47, 49); break; - case 60: - jjAddStates(46, 48); + case 66: + jjAddStates(50, 52); break; default : break; } @@ -1508,56 +1523,56 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 82) - kind = 82; + if (kind > 84) + kind = 84; jjCheckNAdd(14); } else if (curChar == 96) - jjCheckNAddStates(49, 54); + jjCheckNAddStates(53, 58); break; case 1: - if (kind > 12) - kind = 12; + if (kind > 13) + kind = 13; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 72) - kind = 72; + if ((0x100000001000L & l) != 0L && kind > 74) + kind = 74; break; case 9: if ((0x2000000020L & l) != 0L) - jjAddStates(55, 56); + jjAddStates(59, 60); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 76) - kind = 76; + if ((0x5000000050L & l) != 0L && kind > 78) + kind = 78; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 82) - kind = 82; + if (kind > 84) + kind = 84; jjCheckNAdd(14); break; case 16: case 17: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 137) - kind = 137; + if (kind > 140) + kind = 140; jjCheckNAdd(17); break; case 22: if ((0x2000000020L & l) != 0L) - jjAddStates(57, 58); + jjAddStates(61, 62); break; case 26: if ((0x2000000020L & l) != 0L) - jjAddStates(59, 60); + jjAddStates(63, 64); break; case 30: if ((0x2000000020L & l) != 0L) - jjAddStates(61, 62); + jjAddStates(65, 66); break; case 34: if ((0x100000001000000L & l) != 0L) @@ -1566,73 +1581,97 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 72) - kind = 72; + if (kind > 74) + kind = 74; jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(31, 33); + if ((0xd7ffffffffffffffL & l) != 0L) + jjCheckNAddStates(33, 36); break; case 40: if (curChar == 92) jjstateSet[jjnewStateCnt++] = 39; break; + case 41: + if (curChar == 123) + jjstateSet[jjnewStateCnt++] = 42; + break; case 42: - jjAddStates(34, 36); + jjstateSet[jjnewStateCnt++] = 43; break; - case 44: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 43; + case 43: + if (curChar == 125) + jjCheckNAddStates(33, 36); + break; + case 45: + if ((0xd7ffffffffffffffL & l) != 0L) + jjCheckNAddStates(37, 40); break; case 47: - jjAddStates(37, 39); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 46; + break; + case 48: + if (curChar == 123) + jjstateSet[jjnewStateCnt++] = 49; break; case 49: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 48; + jjstateSet[jjnewStateCnt++] = 50; break; - case 51: - jjAddStates(40, 42); + case 50: + if (curChar == 125) + jjCheckNAddStates(37, 40); break; case 53: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 52; + jjAddStates(41, 43); break; case 55: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 54; + break; + case 57: + jjAddStates(44, 46); + break; + case 59: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 58; + break; + case 61: if (curChar == 96) - jjCheckNAddStates(49, 54); + jjCheckNAddStates(53, 58); break; - case 56: + case 62: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(43, 45); + jjCheckNAddStates(47, 49); break; - case 57: + case 63: if (curChar == 96) - jjCheckNAddStates(43, 45); + jjCheckNAddStates(47, 49); break; - case 58: + case 64: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 57; + jjstateSet[jjnewStateCnt++] = 63; break; - case 59: - if (curChar == 96 && kind > 78) - kind = 78; + case 65: + if (curChar == 96 && kind > 80) + kind = 80; break; - case 60: + case 66: if ((0xfffffffeffffffffL & l) != 0L) - jjCheckNAddStates(46, 48); + jjCheckNAddStates(50, 52); break; - case 61: + case 67: if (curChar == 96) - jjCheckNAddStates(46, 48); + jjCheckNAddStates(50, 52); break; - case 62: + case 68: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 61; + jjstateSet[jjnewStateCnt++] = 67; break; - case 63: - if (curChar == 96 && kind > 81) - kind = 81; + case 69: + if (curChar == 96 && kind > 83) + kind = 83; break; default : break; } @@ -1650,45 +1689,53 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 82) - kind = 82; + if (kind > 84) + kind = 84; jjCheckNAdd(14); break; case 1: - if ((jjbitVec0[i2] & l2) != 0L && kind > 12) - kind = 12; + if ((jjbitVec0[i2] & l2) != 0L && kind > 13) + kind = 13; break; case 16: case 17: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 137) - kind = 137; + if (kind > 140) + kind = 140; jjCheckNAdd(17); break; case 38: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(31, 33); + jjAddStates(33, 36); break; case 42: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(34, 36); + jjstateSet[jjnewStateCnt++] = 43; + break; + case 45: + if ((jjbitVec0[i2] & l2) != 0L) + jjAddStates(37, 40); break; - case 47: + case 49: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 39); + jjstateSet[jjnewStateCnt++] = 50; break; - case 51: + case 53: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(40, 42); + jjAddStates(41, 43); break; - case 56: + case 57: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(43, 45); + jjAddStates(44, 46); break; - case 60: + case 62: + if ((jjbitVec0[i2] & l2) != 0L) + jjAddStates(47, 49); + break; + case 66: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(46, 48); + jjAddStates(50, 52); break; default : break; } @@ -1701,7 +1748,7 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 64 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 70 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -1712,7 +1759,7 @@ static private final int jjMoveStringLiteralDfa0_3() switch(curChar) { case 42: - return jjMoveStringLiteralDfa1_3(0x10000L); + return jjMoveStringLiteralDfa1_3(0x20000L); default : return 1; } @@ -1726,8 +1773,8 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) switch(curChar) { case 47: - if ((active0 & 0x10000L) != 0L) - return jjStopAtPos(1, 16); + if ((active0 & 0x20000L) != 0L) + return jjStopAtPos(1, 17); break; default : return 2; @@ -1735,25 +1782,26 @@ static private final int jjMoveStringLiteralDfa1_3(long active0) return 2; } 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, 53, 55, 56, 57, 59, 60, 38, 40, 41, + 44, 45, 47, 48, 51, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, + 12, 38, 40, 41, 44, 45, 47, 48, 51, 53, 55, 56, 57, 59, 60, 62, + 64, 65, 66, 68, 69, 62, 64, 65, 66, 68, 69, 10, 11, 23, 24, 27, + 28, 31, 32, }; public static final String[] jjstrLiteralImages = { "", "\74\77", null, "\74\77\75", "\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, 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, "\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, "\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", -"\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", "\74\74\75", -"\76\76\75", null, "\77\76", }; +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", +"\74\74\75", "\76\76\75", null, }; public static final String[] lexStateNames = { "DEFAULT", "PHPPARSING", @@ -1762,28 +1810,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, -1, 2, 3, 4, 1, 0, 1, 1, -1, -1, -1, -1, -1, -1, -1, + -1, 1, 1, 1, 0, -1, -1, -1, -1, -1, -1, 2, 2, 3, 4, 1, 0, 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, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffffffffff8001fL, 0xffffffffffc7d1ffL, 0x7ffL, + 0xfffffffffff0001fL, 0xffffffffff1f47ffL, 0x1fffL, }; static final long[] jjtoSkip = { - 0x3ffe0L, 0x0L, 0x0L, + 0x7ffe0L, 0x0L, 0x0L, }; static final long[] jjtoSpecial = { - 0x3f800L, 0x0L, 0x0L, + 0x7f800L, 0x0L, 0x0L, }; static final long[] jjtoMore = { - 0x40000L, 0x0L, 0x0L, + 0x80000L, 0x0L, 0x0L, }; static protected SimpleCharStream input_stream; -static private final int[] jjrounds = new int[64]; -static private final int[] jjstateSet = new int[128]; +static private final int[] jjrounds = new int[70]; +static private final int[] jjstateSet = new int[140]; static StringBuffer image; static int jjimageLen; static int lengthOfMatch; @@ -1810,7 +1858,7 @@ static private final void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 64; i-- > 0;) + for (i = 70; i-- > 0;) jjrounds[i] = 0x80000000; } static public void ReInit(SimpleCharStream stream, int lexState) @@ -1897,27 +1945,27 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_2(); - if (jjmatchedPos == 0 && jjmatchedKind > 18) + if (jjmatchedPos == 0 && jjmatchedKind > 19) { - jjmatchedKind = 18; + jjmatchedKind = 19; } break; case 3: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_3(); - if (jjmatchedPos == 0 && jjmatchedKind > 18) + if (jjmatchedPos == 0 && jjmatchedKind > 19) { - jjmatchedKind = 18; + jjmatchedKind = 19; } break; case 4: jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_4(); - if (jjmatchedPos == 0 && jjmatchedKind > 18) + if (jjmatchedPos == 0 && jjmatchedKind > 19) { - jjmatchedKind = 18; + jjmatchedKind = 19; } break; } @@ -1992,7 +2040,7 @@ static void SkipLexicalActions(Token matchedToken) { switch(jjmatchedKind) { - case 12 : + case 13 : if (image == null) image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)))); else