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 b7f86bf..26fc6eb 100644 --- a/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java +++ b/net.sourceforge.phpeclipse/src/test/PHPParserTokenManager.java @@ -14,7 +14,9 @@ import net.sourceforge.phpeclipse.actions.PHPStartApacheAction; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpdt.internal.compiler.ast.*; import net.sourceforge.phpdt.internal.compiler.parser.OutlineableWithChildren; +import net.sourceforge.phpdt.internal.compiler.parser.Outlineable; import net.sourceforge.phpdt.internal.compiler.parser.PHPOutlineInfo; +import junit.framework.Assert; public class PHPParserTokenManager implements PHPParserConstants { @@ -389,116 +391,116 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x4800L) != 0L || (active1 & 0x400000L) != 0L || (active2 & 0x10L) != 0L) + if ((active0 & 0x4800L) != 0L || (active1 & 0x800000L) != 0L || (active2 & 0x20L) != 0L) return 2; - if ((active1 & 0x400L) != 0L) + if ((active1 & 0x800L) != 0L) return 16; - if ((active1 & 0x40000000000000L) != 0L || (active2 & 0x100L) != 0L) + if ((active1 & 0x80000000000000L) != 0L || (active2 & 0x200L) != 0L) return 8; - if ((active0 & 0xfffffe3fffe00000L) != 0L || (active1 & 0xc00001ffL) != 0L) + if ((active0 & 0xfffffc7fffe00000L) != 0L || (active1 & 0x1800003ffL) != 0L) { - jjmatchedKind = 106; + jjmatchedKind = 107; return 14; } return -1; case 1: if ((active0 & 0x4000L) != 0L) return 0; - if ((active0 & 0x7fffde3ffee00000L) != 0L || (active1 & 0x800001dfL) != 0L) + if ((active0 & 0x400001000000L) != 0L || (active1 & 0x80000041L) != 0L) + return 14; + if ((active0 & 0xffffbc7ffee00000L) != 0L || (active1 & 0x1000003beL) != 0L) { if (jjmatchedPos != 1) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 1; } return 14; } - if ((active0 & 0x8000200001000000L) != 0L || (active1 & 0x40000020L) != 0L) - return 14; return -1; case 2: - if ((active0 & 0x4002800000800000L) != 0L || (active1 & 0x80000180L) != 0L) + if ((active0 & 0x8005000000800000L) != 0L || (active1 & 0x100000300L) != 0L) return 14; - if ((active0 & 0x3ffd5e3ffe600000L) != 0L || (active1 & 0x7fL) != 0L) + if ((active0 & 0x7ffabc7ffe600000L) != 0L || (active1 & 0xfeL) != 0L) { if (jjmatchedPos != 2) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 2; } return 14; } return -1; case 3: - if ((active0 & 0xc50200a6000000L) != 0L || (active1 & 0x1cL) != 0L) + if ((active0 & 0x18a0400a6000000L) != 0L || (active1 & 0x38L) != 0L) return 14; - if ((active0 & 0x7f385c3f58600000L) != 0L || (active1 & 0x163L) != 0L) + if ((active0 & 0xfe70b87f58600000L) != 0L || (active1 & 0x2c6L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 3; } return 14; } return -1; case 4: - if ((active0 & 0x1310040058200000L) != 0L || (active1 & 0x40L) != 0L) + if ((active0 & 0x2620080058200000L) != 0L || (active1 & 0x80L) != 0L) return 14; - if ((active0 & 0x6c28583f02400000L) != 0L || (active1 & 0x12bL) != 0L) + if ((active0 & 0xd850b07f02400000L) != 0L || (active1 & 0x256L) != 0L) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 4; return 14; } return -1; case 5: - if ((active0 & 0x2028003002000000L) != 0L || (active1 & 0x23L) != 0L) + if ((active0 & 0x4050007002000000L) != 0L || (active1 & 0x46L) != 0L) return 14; - if ((active0 & 0x4c00580f00400000L) != 0L || (active1 & 0x108L) != 0L) + if ((active0 & 0x9800b00f00400000L) != 0L || (active1 & 0x210L) != 0L) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 5; return 14; } return -1; case 6: - if ((active0 & 0x4000500f00000000L) != 0L || (active1 & 0x108L) != 0L) + if ((active0 & 0x8000a00f00000000L) != 0L || (active1 & 0x210L) != 0L) return 14; - if ((active0 & 0xc00080000400000L) != 0L) + if ((active0 & 0x1800100000400000L) != 0L) { if (jjmatchedPos != 6) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 6; } return 14; } return -1; case 7: - if ((active0 & 0x400080000400000L) != 0L) + if ((active0 & 0x800100000400000L) != 0L) return 14; - if ((active0 & 0x800000c00000000L) != 0L) + if ((active0 & 0x1000000c00000000L) != 0L) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 7; return 14; } return -1; case 8: - if ((active0 & 0x800000000000000L) != 0L) - return 14; if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 8; return 14; } + if ((active0 & 0x1000000000000000L) != 0L) + return 14; return -1; case 9: if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 9; return 14; } @@ -506,7 +508,7 @@ private static final int jjStopStringLiteralDfa_1(int pos, long active0, long ac case 10: if ((active0 & 0xc00000000L) != 0L) { - jjmatchedKind = 106; + jjmatchedKind = 107; jjmatchedPos = 10; return 14; } @@ -532,126 +534,126 @@ static private final int jjMoveStringLiteralDfa0_1() switch(curChar) { case 33: - jjmatchedKind = 75; - return jjMoveStringLiteralDfa1_1(0x0L, 0x5000000000000000L, 0x0L); + jjmatchedKind = 76; + return jjMoveStringLiteralDfa1_1(0x0L, 0xa000000000000000L, 0x0L); case 35: return jjStopAtPos(0, 12); case 36: - return jjStartNfaWithStates_1(0, 74, 16); + return jjStartNfaWithStates_1(0, 75, 16); case 37: - jjmatchedKind = 90; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L); + jjmatchedKind = 91; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L); case 38: - jjmatchedKind = 87; - return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x20L); + jjmatchedKind = 88; + return jjMoveStringLiteralDfa1_1(0x0L, 0x20000L, 0x40L); case 40: - return jjStopAtPos(0, 110); - case 41: return jjStopAtPos(0, 111); + case 41: + return jjStopAtPos(0, 112); case 42: - jjmatchedKind = 85; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x8L); + jjmatchedKind = 86; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x10L); case 43: - jjmatchedKind = 83; - return jjMoveStringLiteralDfa1_1(0x0L, 0x20000L, 0x2L); + jjmatchedKind = 84; + return jjMoveStringLiteralDfa1_1(0x0L, 0x40000L, 0x4L); case 44: - return jjStopAtPos(0, 117); + return jjStopAtPos(0, 118); case 45: - jjmatchedKind = 84; - return jjMoveStringLiteralDfa1_1(0x4000000000L, 0x40000L, 0x4L); + jjmatchedKind = 85; + return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x80000L, 0x8L); case 46: - jjmatchedKind = 118; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L); + jjmatchedKind = 119; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x200L); case 47: - jjmatchedKind = 86; - return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x10L); + jjmatchedKind = 87; + return jjMoveStringLiteralDfa1_1(0x4800L, 0x0L, 0x20L); case 58: - jjmatchedKind = 78; - return jjMoveStringLiteralDfa1_1(0x8000000000L, 0x0L, 0x0L); + jjmatchedKind = 79; + return jjMoveStringLiteralDfa1_1(0x10000000000L, 0x0L, 0x0L); case 59: - return jjStopAtPos(0, 116); + return jjStopAtPos(0, 117); case 60: - jjmatchedKind = 120; - return jjMoveStringLiteralDfa1_1(0x0L, 0x2400000008000000L, 0x800L); + jjmatchedKind = 121; + return jjMoveStringLiteralDfa1_1(0x0L, 0x4800000010000000L, 0x1000L); case 61: - jjmatchedKind = 128; - return jjMoveStringLiteralDfa1_1(0x10000000000L, 0x8200000000000000L, 0x0L); + jjmatchedKind = 129; + return jjMoveStringLiteralDfa1_1(0x20000000000L, 0x400000000000000L, 0x1L); case 62: - jjmatchedKind = 119; - return jjMoveStringLiteralDfa1_1(0x0L, 0x800000030000000L, 0x1000L); + jjmatchedKind = 120; + return jjMoveStringLiteralDfa1_1(0x0L, 0x1000000060000000L, 0x2000L); case 63: - jjmatchedKind = 77; + jjmatchedKind = 78; return jjMoveStringLiteralDfa1_1(0x10L, 0x0L, 0x0L); case 64: - return jjStopAtPos(0, 73); + return jjStopAtPos(0, 74); case 91: - return jjStopAtPos(0, 114); - case 93: return jjStopAtPos(0, 115); + case 93: + return jjStopAtPos(0, 116); case 94: - jjmatchedKind = 89; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x80L); + jjmatchedKind = 90; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x100L); case 65: case 97: - return jjMoveStringLiteralDfa1_1(0x8000000008000000L, 0x80000000L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8000000L, 0x100000001L, 0x0L); case 66: case 98: - return jjMoveStringLiteralDfa1_1(0x10000000L, 0xcL, 0x0L); + return jjMoveStringLiteralDfa1_1(0x10000000L, 0x18L, 0x0L); case 67: case 99: - return jjMoveStringLiteralDfa1_1(0xe0000200000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x1c0000200000L, 0x0L, 0x0L); case 68: case 100: - return jjMoveStringLiteralDfa1_1(0x300000000000L, 0x20L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x602000000000L, 0x40L, 0x0L); case 69: case 101: - return jjMoveStringLiteralDfa1_1(0x3c00400086000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x7800800086000000L, 0x0L, 0x0L); case 70: case 102: - return jjMoveStringLiteralDfa1_1(0x4100800000400000L, 0x40L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x8201000000400000L, 0x80L, 0x0L); case 71: case 103: - return jjMoveStringLiteralDfa1_1(0x1001000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x2001000000000L, 0x0L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_1(0x501000000L, 0x180L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x501000000L, 0x300L, 0x0L); case 76: case 108: return jjMoveStringLiteralDfa1_1(0x20000000L, 0x0L, 0x0L); case 78: case 110: - return jjMoveStringLiteralDfa1_1(0x6000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0xc000000000000L, 0x0L, 0x0L); case 79: case 111: - return jjMoveStringLiteralDfa1_1(0x0L, 0x40000002L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x0L, 0x80000004L, 0x0L); case 80: case 112: return jjMoveStringLiteralDfa1_1(0x40000000L, 0x0L, 0x0L); case 82: case 114: - return jjMoveStringLiteralDfa1_1(0x8000a00000000L, 0x10L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x10000a00000000L, 0x20L, 0x0L); case 83: case 115: - return jjMoveStringLiteralDfa1_1(0x30002000000000L, 0x1L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x60004000000000L, 0x2L, 0x0L); case 84: case 116: - return jjMoveStringLiteralDfa1_1(0xc0000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x180000000000000L, 0x0L, 0x0L); case 86: case 118: return jjMoveStringLiteralDfa1_1(0x800000L, 0x0L, 0x0L); case 87: case 119: - return jjMoveStringLiteralDfa1_1(0x200000000000000L, 0x0L, 0x0L); + return jjMoveStringLiteralDfa1_1(0x400000000000000L, 0x0L, 0x0L); case 123: - return jjStopAtPos(0, 112); + return jjStopAtPos(0, 113); case 124: - jjmatchedKind = 88; - return jjMoveStringLiteralDfa1_1(0x0L, 0x8000L, 0x40L); + jjmatchedKind = 89; + return jjMoveStringLiteralDfa1_1(0x0L, 0x10000L, 0x80L); case 125: - return jjStopAtPos(0, 113); + return jjStopAtPos(0, 114); case 126: - jjmatchedKind = 76; - return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x400L); + jjmatchedKind = 77; + return jjMoveStringLiteralDfa1_1(0x0L, 0x0L, 0x800L); default : return jjMoveNfa_1(3, 0); } @@ -666,53 +668,51 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l switch(curChar) { case 38: - if ((active1 & 0x10000L) != 0L) - return jjStopAtPos(1, 80); + if ((active1 & 0x20000L) != 0L) + return jjStopAtPos(1, 81); break; case 42: if ((active0 & 0x4000L) != 0L) return jjStartNfaWithStates_1(1, 14, 0); break; case 43: - if ((active1 & 0x20000L) != 0L) - return jjStopAtPos(1, 81); - break; - case 45: if ((active1 & 0x40000L) != 0L) return jjStopAtPos(1, 82); break; + case 45: + if ((active1 & 0x80000L) != 0L) + return jjStopAtPos(1, 83); + break; case 47: if ((active0 & 0x800L) != 0L) return jjStopAtPos(1, 11); break; case 58: - if ((active0 & 0x8000000000L) != 0L) - return jjStopAtPos(1, 39); + if ((active0 & 0x10000000000L) != 0L) + return jjStopAtPos(1, 40); break; case 60: - if ((active1 & 0x8000000L) != 0L) + if ((active1 & 0x10000000L) != 0L) { - jjmatchedKind = 91; + jjmatchedKind = 92; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x800L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0L, active2, 0x1000L); case 61: - if ((active1 & 0x200000000000000L) != 0L) + if ((active1 & 0x400000000000000L) != 0L) { - jjmatchedKind = 121; + jjmatchedKind = 122; jjmatchedPos = 1; } - else if ((active1 & 0x400000000000000L) != 0L) - return jjStopAtPos(1, 122); else if ((active1 & 0x800000000000000L) != 0L) return jjStopAtPos(1, 123); else if ((active1 & 0x1000000000000000L) != 0L) + return jjStopAtPos(1, 124); + else if ((active1 & 0x2000000000000000L) != 0L) { - jjmatchedKind = 124; + jjmatchedKind = 125; jjmatchedPos = 1; } - else if ((active2 & 0x2L) != 0L) - return jjStopAtPos(1, 129); else if ((active2 & 0x4L) != 0L) return jjStopAtPos(1, 130); else if ((active2 & 0x8L) != 0L) @@ -731,34 +731,36 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l return jjStopAtPos(1, 137); else if ((active2 & 0x400L) != 0L) return jjStopAtPos(1, 138); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0xc000000000000000L, active2, 0L); + else if ((active2 & 0x800L) != 0L) + return jjStopAtPos(1, 139); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x8000000000000000L, active2, 0x1L); case 62: if ((active0 & 0x10L) != 0L) return jjStopAtPos(1, 4); - else if ((active0 & 0x4000000000L) != 0L) - return jjStopAtPos(1, 38); - else if ((active0 & 0x10000000000L) != 0L) - return jjStopAtPos(1, 40); - else if ((active1 & 0x10000000L) != 0L) + else if ((active0 & 0x8000000000L) != 0L) + return jjStopAtPos(1, 39); + else if ((active0 & 0x20000000000L) != 0L) + return jjStopAtPos(1, 41); + else if ((active1 & 0x20000000L) != 0L) { - jjmatchedKind = 92; + jjmatchedKind = 93; jjmatchedPos = 1; } - else if ((active1 & 0x2000000000000000L) != 0L) - return jjStopAtPos(1, 125); - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x20000000L, active2, 0x1000L); + else if ((active1 & 0x4000000000000000L) != 0L) + return jjStopAtPos(1, 126); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x40000000L, active2, 0x2000L); case 65: case 97: - return jjMoveStringLiteralDfa2_1(active0, 0x100020000800000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x200040000800000L, active1, 0L, active2, 0L); case 66: case 98: - return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x2L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0L, active1, 0x4L, active2, 0L); case 67: case 99: return jjMoveStringLiteralDfa2_1(active0, 0x80000000L, active1, 0L, active2, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_1(active0, 0xa100a00000000L, active1, 0x10L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x14202a00000000L, active1, 0x20L, active2, 0L); case 70: case 102: if ((active0 & 0x1000000L) != 0L) @@ -766,49 +768,49 @@ static private final int jjMoveStringLiteralDfa1_1(long active0, long active1, l break; case 72: case 104: - return jjMoveStringLiteralDfa2_1(active0, 0x240000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x480000000000000L, active1, 0L, active2, 0L); case 73: case 105: return jjMoveStringLiteralDfa2_1(active0, 0x20000000L, active1, 0L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa2_1(active0, 0x1006200000L, active1, 0x40L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x1006200000L, active1, 0x80L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa2_1(active0, 0x3c00000500000000L, active1, 0x80000180L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x7800000500000000L, active1, 0x100000300L, active2, 0L); case 79: case 111: - if ((active0 & 0x200000000000L) != 0L) + if ((active0 & 0x400000000000L) != 0L) { - jjmatchedKind = 45; + jjmatchedKind = 46; jjmatchedPos = 1; } - return jjMoveStringLiteralDfa2_1(active0, 0x40018c0000000000L, active1, 0x2cL, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x8003180000000000L, active1, 0x58L, active2, 0L); case 82: case 114: - if ((active1 & 0x40000000L) != 0L) - return jjStartNfaWithStates_1(1, 94, 14); - return jjMoveStringLiteralDfa2_1(active0, 0x80000058000000L, active1, 0L, active2, 0L); + if ((active1 & 0x80000000L) != 0L) + return jjStartNfaWithStates_1(1, 95, 14); + return jjMoveStringLiteralDfa2_1(active0, 0x100000058000000L, active1, 0L, active2, 0L); case 83: case 115: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_1(1, 63, 14); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_1(1, 64, 14); break; case 84: case 116: - return jjMoveStringLiteralDfa2_1(active0, 0x2000000000L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x4000000000L, active1, 0x2L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa2_1(active0, 0x14000000400000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x28000000400000L, active1, 0L, active2, 0L); case 87: case 119: - return jjMoveStringLiteralDfa2_1(active0, 0x20000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x40000000000000L, active1, 0L, active2, 0L); case 88: case 120: - return jjMoveStringLiteralDfa2_1(active0, 0x400000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa2_1(active0, 0x800000000000L, active1, 0L, active2, 0L); case 124: - if ((active1 & 0x8000L) != 0L) - return jjStopAtPos(1, 79); + if ((active1 & 0x10000L) != 0L) + return jjStopAtPos(1, 80); break; default : break; @@ -827,57 +829,57 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long switch(curChar) { case 61: - if ((active1 & 0x4000000000000000L) != 0L) - return jjStopAtPos(2, 126); - else if ((active1 & 0x8000000000000000L) != 0L) + if ((active1 & 0x8000000000000000L) != 0L) return jjStopAtPos(2, 127); - else if ((active2 & 0x800L) != 0L) - return jjStopAtPos(2, 139); + else if ((active2 & 0x1L) != 0L) + return jjStopAtPos(2, 128); else if ((active2 & 0x1000L) != 0L) return jjStopAtPos(2, 140); + else if ((active2 & 0x2000L) != 0L) + return jjStopAtPos(2, 141); break; case 62: - if ((active1 & 0x20000000L) != 0L) - return jjStopAtPos(2, 93); + if ((active1 & 0x40000000L) != 0L) + return jjStopAtPos(2, 94); break; case 65: case 97: - return jjMoveStringLiteralDfa3_1(active0, 0x2000200000L, active1, 0x10L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4000200000L, active1, 0x20L, active2, 0L); case 67: case 99: return jjMoveStringLiteralDfa3_1(active0, 0x500000000L, active1, 0L, active2, 0L); case 68: case 100: - if ((active1 & 0x80000000L) != 0L) - return jjStartNfaWithStates_1(2, 95, 14); - return jjMoveStringLiteralDfa3_1(active0, 0x3c00000000000000L, active1, 0L, active2, 0L); + if ((active1 & 0x100000000L) != 0L) + return jjStartNfaWithStates_1(2, 96, 14); + return jjMoveStringLiteralDfa3_1(active0, 0x7800000000000000L, active1, 0L, active2, 0L); case 69: case 101: return jjMoveStringLiteralDfa3_1(active0, 0x10000000L, active1, 0L, active2, 0L); case 70: case 102: - return jjMoveStringLiteralDfa3_1(active0, 0x100000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x202000000000L, active1, 0L, active2, 0L); case 72: case 104: return jjMoveStringLiteralDfa3_1(active0, 0x80000000L, active1, 0L, active2, 0L); case 73: case 105: - return jjMoveStringLiteralDfa3_1(active0, 0x260000040000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x4c0000040000000L, active1, 0L, active2, 0L); case 74: case 106: - return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x2L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0L, active1, 0x4L, active2, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_1(active0, 0x104000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x208000000000000L, active1, 0L, active2, 0L); case 78: case 110: - return jjMoveStringLiteralDfa3_1(active0, 0xc0000400000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x180000400000L, active1, 0L, active2, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_1(active0, 0x1000000000L, active1, 0x4cL, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x1000000000L, active1, 0x98L, active2, 0L); case 80: case 112: - return jjMoveStringLiteralDfa3_1(active0, 0x10000000000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x20000000000000L, active1, 0L, active2, 0L); case 81: case 113: return jjMoveStringLiteralDfa3_1(active0, 0xa00000000L, active1, 0L, active2, 0L); @@ -885,30 +887,30 @@ static private final int jjMoveStringLiteralDfa2_1(long old0, long active0, long case 114: if ((active0 & 0x800000L) != 0L) return jjStartNfaWithStates_1(2, 23, 14); - else if ((active0 & 0x800000000000L) != 0L) + else if ((active0 & 0x1000000000000L) != 0L) { - jjmatchedKind = 47; + jjmatchedKind = 48; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x4000000008000000L, active1, 0x1L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x8000000008000000L, active1, 0x2L, active2, 0L); case 83: case 115: - return jjMoveStringLiteralDfa3_1(active0, 0x20026000000L, active1, 0L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x40026000000L, active1, 0L, active2, 0L); case 84: case 116: - if ((active1 & 0x80L) != 0L) + if ((active1 & 0x100L) != 0L) { - jjmatchedKind = 71; + jjmatchedKind = 72; jjmatchedPos = 2; } - return jjMoveStringLiteralDfa3_1(active0, 0x9400000000000L, active1, 0x100L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x12800000000000L, active1, 0x200L, active2, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_1(active0, 0x80000000000000L, active1, 0x20L, active2, 0L); + return jjMoveStringLiteralDfa3_1(active0, 0x100000000000000L, active1, 0x40L, active2, 0L); case 87: case 119: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_1(2, 49, 14); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_1(2, 50, 14); break; default : break; @@ -928,10 +930,10 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa4_1(active0, 0x100018000000L, active1, 0x40L); + return jjMoveStringLiteralDfa4_1(active0, 0x200018000000L, active1, 0x80L); case 66: case 98: - return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0x20L); + return jjMoveStringLiteralDfa4_1(active0, 0x1000000000L, active1, 0x40L); case 67: case 99: return jjMoveStringLiteralDfa4_1(active0, 0x400000L, active1, 0L); @@ -942,29 +944,29 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long jjmatchedKind = 26; jjmatchedPos = 3; } - else if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_1(3, 41, 14); - else if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 55, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x4010400002000000L, active1, 0x102L); + else if ((active0 & 0x40000000000L) != 0L) + return jjStartNfaWithStates_1(3, 42, 14); + else if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 56, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x8020800002000000L, active1, 0x204L); case 70: case 102: - return jjMoveStringLiteralDfa4_1(active0, 0x2000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x4000000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa4_1(active0, 0x1000000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa4_1(active0, 0x2000002000000000L, active1, 0x2L); case 76: case 108: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 50, 14); - else if ((active1 & 0x4L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 51, 14); + else if ((active1 & 0x8L) != 0L) { - jjmatchedKind = 66; + jjmatchedKind = 67; jjmatchedPos = 3; } - else if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_1(3, 68, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x200000500000000L, active1, 0x8L); + else if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_1(3, 69, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x400000500000000L, active1, 0x10L); case 78: case 110: return jjMoveStringLiteralDfa4_1(active0, 0x40000000L, active1, 0L); @@ -972,25 +974,25 @@ static private final int jjMoveStringLiteralDfa3_1(long old0, long active0, long case 111: if ((active0 & 0x80000000L) != 0L) return jjStartNfaWithStates_1(3, 31, 14); - else if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 48, 14); + else if ((active0 & 0x2000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 49, 14); break; case 83: case 115: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_1(3, 54, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x900040000200000L, active1, 0L); + if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_1(3, 55, 14); + return jjMoveStringLiteralDfa4_1(active0, 0x1200080000200000L, active1, 0L); case 84: case 116: if ((active0 & 0x20000000L) != 0L) return jjStartNfaWithStates_1(3, 29, 14); - return jjMoveStringLiteralDfa4_1(active0, 0x20082000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x40104000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa4_1(active0, 0x8000a00000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x10000a00000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa4_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_1(active0, 0x800000000000000L, active1, 0L); default : break; } @@ -1009,31 +1011,31 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa5_1(active0, 0x4000001000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x8000001000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa5_1(active0, 0x20000000000000L, active1, 0x2L); + return jjMoveStringLiteralDfa5_1(active0, 0x40000000000000L, active1, 0x4L); case 69: case 101: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 56, 14); - else if ((active0 & 0x200000000000000L) != 0L) + if ((active0 & 0x200000000000000L) != 0L) return jjStartNfaWithStates_1(4, 57, 14); - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x8L); + else if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 58, 14); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x10L); case 70: case 102: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 60, 14); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 61, 14); break; case 71: case 103: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x100L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x200L); case 72: case 104: - return jjMoveStringLiteralDfa5_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa5_1(active0, 0x82a02000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x104a02000000L, active1, 0L); case 75: case 107: if ((active0 & 0x10000000L) != 0L) @@ -1041,18 +1043,18 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long break; case 76: case 108: - return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x20L); + return jjMoveStringLiteralDfa5_1(active0, 0L, active1, 0x40L); case 78: case 110: - return jjMoveStringLiteralDfa5_1(active0, 0x400000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa5_1(active0, 0x802000000000L, active1, 0x2L); case 79: case 111: - return jjMoveStringLiteralDfa5_1(active0, 0x2000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x4000000000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_1(4, 52, 14); - return jjMoveStringLiteralDfa5_1(active0, 0x8000000000000L, active1, 0L); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_1(4, 53, 14); + return jjMoveStringLiteralDfa5_1(active0, 0x10000000000000L, active1, 0L); case 83: case 115: if ((active0 & 0x200000L) != 0L) @@ -1062,17 +1064,17 @@ static private final int jjMoveStringLiteralDfa4_1(long old0, long active0, long case 116: if ((active0 & 0x40000000L) != 0L) return jjStartNfaWithStates_1(4, 30, 14); - else if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_1(4, 42, 14); - else if ((active1 & 0x40L) != 0L) - return jjStartNfaWithStates_1(4, 70, 14); + else if ((active0 & 0x80000000000L) != 0L) + return jjStartNfaWithStates_1(4, 43, 14); + else if ((active1 & 0x80L) != 0L) + return jjStartNfaWithStates_1(4, 71, 14); return jjMoveStringLiteralDfa5_1(active0, 0x400000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa5_1(active0, 0x100500000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x200500000000L, active1, 0L); case 87: case 119: - return jjMoveStringLiteralDfa5_1(active0, 0x800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_1(active0, 0x1000000000000000L, active1, 0L); case 89: case 121: if ((active0 & 0x8000000L) != 0L) @@ -1096,20 +1098,22 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long { case 65: case 97: - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x8L); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x10L); case 67: case 99: - if ((active0 & 0x2000000000L) != 0L) - return jjStartNfaWithStates_1(5, 37, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x4000000000000000L, active1, 0L); + if ((active0 & 0x4000000000L) != 0L) + return jjStartNfaWithStates_1(5, 38, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x8000000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa6_1(active0, 0x400500000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x800500000000L, active1, 0L); case 69: case 101: - if ((active1 & 0x20L) != 0L) - return jjStartNfaWithStates_1(5, 69, 14); - return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x100L); + if ((active0 & 0x2000000000L) != 0L) + return jjStartNfaWithStates_1(5, 37, 14); + else if ((active1 & 0x40L) != 0L) + return jjStartNfaWithStates_1(5, 70, 14); + return jjMoveStringLiteralDfa6_1(active0, 0L, active1, 0x200L); case 70: case 102: if ((active0 & 0x2000000L) != 0L) @@ -1117,36 +1121,36 @@ static private final int jjMoveStringLiteralDfa5_1(long old0, long active0, long break; case 71: case 103: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_1(5, 64, 14); + if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_1(5, 65, 14); break; case 72: case 104: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 53, 14); + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 54, 14); break; case 73: case 105: - return jjMoveStringLiteralDfa6_1(active0, 0xc00000000400000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x1800000000400000L, active1, 0L); case 76: case 108: if ((active0 & 0x1000000000L) != 0L) return jjStartNfaWithStates_1(5, 36, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x100000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_1(active0, 0x200000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 51, 14); - return jjMoveStringLiteralDfa6_1(active0, 0x80000000000L, active1, 0L); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 52, 14); + return jjMoveStringLiteralDfa6_1(active0, 0x100000000000L, active1, 0L); case 82: case 114: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_1(5, 61, 14); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_1(5, 62, 14); return jjMoveStringLiteralDfa6_1(active0, 0xa00000000L, active1, 0L); case 84: case 116: - if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_1(5, 65, 14); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_1(5, 66, 14); break; default : break; @@ -1179,38 +1183,38 @@ static private final int jjMoveStringLiteralDfa6_1(long old0, long active0, long return jjMoveStringLiteralDfa7_1(active0, 0xc00000000L, active1, 0L); case 72: case 104: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_1(6, 62, 14); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_1(6, 63, 14); break; case 76: case 108: - return jjMoveStringLiteralDfa7_1(active0, 0x400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x800000000000000L, active1, 0L); case 78: case 110: - if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_1(6, 67, 14); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_1(6, 68, 14); break; case 79: case 111: return jjMoveStringLiteralDfa7_1(active0, 0x400000L, active1, 0L); case 82: case 114: - if ((active1 & 0x100L) != 0L) - return jjStartNfaWithStates_1(6, 72, 14); + if ((active1 & 0x200L) != 0L) + return jjStartNfaWithStates_1(6, 73, 14); break; case 83: case 115: - if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_1(6, 46, 14); + if ((active0 & 0x800000000000L) != 0L) + return jjStartNfaWithStates_1(6, 47, 14); break; case 84: case 116: - if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_1(6, 44, 14); - return jjMoveStringLiteralDfa7_1(active0, 0x800000000000000L, active1, 0L); + if ((active0 & 0x200000000000L) != 0L) + return jjStartNfaWithStates_1(6, 45, 14); + return jjMoveStringLiteralDfa7_1(active0, 0x1000000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa7_1(active0, 0x80000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_1(active0, 0x100000000000L, active1, 0L); default : break; } @@ -1231,13 +1235,13 @@ static private final int jjMoveStringLiteralDfa7_1(long old0, long active0, long return jjMoveStringLiteralDfa8_1(active0, 0xc00000000L); case 67: case 99: - return jjMoveStringLiteralDfa8_1(active0, 0x800000000000000L); + return jjMoveStringLiteralDfa8_1(active0, 0x1000000000000000L); case 69: case 101: - if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_1(7, 43, 14); - else if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_1(7, 58, 14); + if ((active0 & 0x100000000000L) != 0L) + return jjStartNfaWithStates_1(7, 44, 14); + else if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_1(7, 59, 14); break; case 78: case 110: @@ -1262,8 +1266,8 @@ static private final int jjMoveStringLiteralDfa8_1(long old0, long active0) { case 72: case 104: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_1(8, 59, 14); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_1(8, 60, 14); break; case 79: case 111: @@ -1371,14 +1375,14 @@ static private final int jjMoveNfa_1(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 2; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 96) - kind = 96; + if (kind > 97) + kind = 97; jjCheckNAddTwoStates(5, 6); } else if (curChar == 48) { - if (kind > 96) - kind = 96; + if (kind > 97) + kind = 97; jjCheckNAddStates(19, 21); } break; @@ -1397,15 +1401,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 4: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 96) - kind = 96; + if (kind > 97) + kind = 97; jjCheckNAddTwoStates(5, 6); break; case 5: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 96) - kind = 96; + if (kind > 97) + kind = 97; jjCheckNAddTwoStates(5, 6); break; case 7: @@ -1415,8 +1419,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 100) - kind = 100; + if (kind > 101) + kind = 101; jjCheckNAddStates(22, 24); break; case 10: @@ -1426,15 +1430,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 100) - kind = 100; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(11, 12); break; case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 106) - kind = 106; + if (kind > 107) + kind = 107; jjstateSet[jjnewStateCnt++] = 14; break; case 15: @@ -1444,8 +1448,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 141) - kind = 141; + if (kind > 142) + kind = 142; jjstateSet[jjnewStateCnt++] = 17; break; case 18: @@ -1459,15 +1463,15 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 20: if (curChar != 46) break; - if (kind > 100) - kind = 100; + if (kind > 101) + kind = 101; jjCheckNAddStates(25, 27); break; case 21: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 100) - kind = 100; + if (kind > 101) + kind = 101; jjCheckNAddStates(25, 27); break; case 23: @@ -1477,8 +1481,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 24: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 100) - kind = 100; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(24, 12); break; case 25: @@ -1492,8 +1496,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 28: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 100) - kind = 100; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(28, 12); break; case 29: @@ -1511,22 +1515,22 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 33: if (curChar != 48) break; - if (kind > 96) - kind = 96; + if (kind > 97) + kind = 97; jjCheckNAddStates(19, 21); break; case 35: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 96) - kind = 96; + if (kind > 97) + kind = 97; jjCheckNAddTwoStates(35, 6); break; case 36: if ((0xff000000000000L & l) == 0L) break; - if (kind > 96) - kind = 96; + if (kind > 97) + kind = 97; jjCheckNAddTwoStates(36, 6); break; case 37: @@ -1537,25 +1541,23 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xfffffffbffffffffL & l) != 0L) jjCheckNAddStates(31, 33); break; - case 39: - if (curChar == 34) - jjCheckNAddStates(31, 33); + case 40: + jjCheckNAddStates(31, 33); break; case 41: - if (curChar == 34 && kind > 102) - kind = 102; + if (curChar == 34 && kind > 103) + kind = 103; break; case 42: if ((0xfffffffbffffffffL & l) != 0L) jjCheckNAddStates(34, 36); break; - case 43: - if (curChar == 34) - jjCheckNAddStates(34, 36); + case 44: + jjCheckNAddStates(34, 36); break; case 45: - if (curChar == 34 && kind > 103) - kind = 103; + if (curChar == 34 && kind > 104) + kind = 104; break; case 46: if (curChar == 39) @@ -1565,31 +1567,31 @@ static private final int jjMoveNfa_1(int startState, int curPos) if ((0xffffff7fffffffffL & l) != 0L) jjCheckNAddStates(37, 39); break; - case 48: - if (curChar == 39) - jjCheckNAddStates(37, 39); + case 49: + jjCheckNAddStates(37, 39); break; case 50: - if (curChar == 39 && kind > 102) - kind = 102; + if (curChar == 39 && kind > 103) + kind = 103; break; case 51: if ((0xffffff7fffffffffL & l) != 0L) jjCheckNAddStates(40, 42); break; - case 52: - if (curChar == 39) - jjCheckNAddStates(40, 42); + case 53: + jjCheckNAddStates(40, 42); break; case 54: - if (curChar == 39 && kind > 104) - kind = 104; + if (curChar == 39 && kind > 105) + kind = 105; break; case 56: - jjAddStates(43, 45); + case 58: + jjCheckNAddStates(43, 45); break; case 60: - jjAddStates(46, 48); + case 62: + jjCheckNAddStates(46, 48); break; default : break; } @@ -1605,8 +1607,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 3: if ((0x87fffffe87fffffeL & l) != 0L) { - if (kind > 106) - kind = 106; + if (kind > 107) + kind = 107; jjCheckNAdd(14); } else if (curChar == 96) @@ -1617,31 +1619,31 @@ static private final int jjMoveNfa_1(int startState, int curPos) kind = 13; break; case 6: - if ((0x100000001000L & l) != 0L && kind > 96) - kind = 96; + if ((0x100000001000L & l) != 0L && kind > 97) + kind = 97; break; case 9: if ((0x2000000020L & l) != 0L) jjAddStates(55, 56); break; case 12: - if ((0x5000000050L & l) != 0L && kind > 100) - kind = 100; + if ((0x5000000050L & l) != 0L && kind > 101) + kind = 101; break; case 13: case 14: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 106) - kind = 106; + if (kind > 107) + kind = 107; jjCheckNAdd(14); break; case 16: case 17: if ((0x87fffffe87fffffeL & l) == 0L) break; - if (kind > 141) - kind = 141; + if (kind > 142) + kind = 142; jjCheckNAdd(17); break; case 22: @@ -1663,73 +1665,87 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 35: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 96) - kind = 96; + if (kind > 97) + kind = 97; jjCheckNAddTwoStates(35, 6); break; case 38: - jjAddStates(31, 33); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(31, 33); break; - case 40: + case 39: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 39; + jjstateSet[jjnewStateCnt++] = 40; + break; + case 40: + jjCheckNAddStates(31, 33); break; case 42: - jjAddStates(34, 36); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(34, 36); break; - case 44: + case 43: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 43; + jjstateSet[jjnewStateCnt++] = 44; + break; + case 44: + jjCheckNAddStates(34, 36); break; case 47: - jjAddStates(37, 39); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(37, 39); break; - case 49: + case 48: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 48; + jjstateSet[jjnewStateCnt++] = 49; + break; + case 49: + jjCheckNAddStates(37, 39); break; case 51: - jjAddStates(40, 42); + if ((0xffffffffefffffffL & l) != 0L) + jjCheckNAddStates(40, 42); break; - case 53: + case 52: if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 52; + jjstateSet[jjnewStateCnt++] = 53; + break; + case 53: + jjCheckNAddStates(40, 42); break; case 55: if (curChar == 96) jjCheckNAddStates(49, 54); break; case 56: - if ((0xfffffffeffffffffL & l) != 0L) + if ((0xfffffffeefffffffL & l) != 0L) jjCheckNAddStates(43, 45); break; case 57: - if (curChar == 96) - jjCheckNAddStates(43, 45); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 58; break; case 58: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 57; + jjCheckNAddStates(43, 45); break; case 59: - if (curChar == 96 && kind > 102) - kind = 102; + if (curChar == 96 && kind > 103) + kind = 103; break; case 60: - if ((0xfffffffeffffffffL & l) != 0L) + if ((0xfffffffeefffffffL & l) != 0L) jjCheckNAddStates(46, 48); break; case 61: - if (curChar == 96) - jjCheckNAddStates(46, 48); + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 62; break; case 62: - if (curChar == 92) - jjstateSet[jjnewStateCnt++] = 61; + jjCheckNAddStates(46, 48); break; case 63: - if (curChar == 96 && kind > 105) - kind = 105; + if (curChar == 96 && kind > 106) + kind = 106; break; default : break; } @@ -1747,8 +1763,8 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 14: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 106) - kind = 106; + if (kind > 107) + kind = 107; jjCheckNAdd(14); break; case 1: @@ -1759,33 +1775,39 @@ static private final int jjMoveNfa_1(int startState, int curPos) case 17: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 141) - kind = 141; + if (kind > 142) + kind = 142; jjCheckNAdd(17); break; case 38: + case 40: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(31, 33); + jjCheckNAddStates(31, 33); break; case 42: + case 44: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(34, 36); + jjCheckNAddStates(34, 36); break; case 47: + case 49: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(37, 39); + jjCheckNAddStates(37, 39); break; case 51: + case 53: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(40, 42); + jjCheckNAddStates(40, 42); break; case 56: + case 58: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(43, 45); + jjCheckNAddStates(43, 45); break; case 60: + case 62: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(46, 48); + jjCheckNAddStates(46, 48); break; default : break; } @@ -1875,15 +1897,15 @@ static private final int jjMoveStringLiteralDfa3_3(long old0, long active0) return 4; } static final int[] jjnextStates = { - 19, 20, 25, 26, 29, 30, 12, 47, 49, 50, 51, 53, 54, 38, 40, 41, - 42, 44, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, - 40, 41, 42, 44, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, 60, 62, - 63, 56, 58, 59, 60, 62, 63, 10, 11, 23, 24, 27, 28, 31, 32, + 19, 20, 25, 26, 29, 30, 12, 47, 48, 50, 51, 52, 54, 38, 39, 41, + 42, 43, 45, 34, 36, 6, 8, 9, 12, 21, 22, 12, 29, 30, 12, 38, + 39, 41, 42, 43, 45, 47, 48, 50, 51, 52, 54, 56, 57, 59, 60, 61, + 63, 56, 57, 59, 60, 61, 63, 10, 11, 23, 24, 27, 28, 31, 32, }; public static final String[] jjstrLiteralImages = { "", "\74\77", null, "\74\77\75", "\77\76", null, null, null, null, null, null, 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, "\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, "\100", "\44", "\41", "\176", "\77", @@ -1907,10 +1929,10 @@ public static final int[] jjnewLexState = { -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 = { - 0xffffffffffe0001fL, 0xffffc7d1ffffffffL, 0x3fffL, + 0xffffffffffe0001fL, 0xffff8fa3ffffffffL, 0x7fffL, }; static final long[] jjtoSkip = { 0xfffe0L, 0x0L, 0x0L,