diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-11-27 13:01:21 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2012-11-27 13:02:53 +0200 |
| commit | 82120d5db9eee301143e234d0217b0083b8c97ec (patch) | |
| tree | 0a51d27592b86fba8ea45079164a79c4aead4666 /theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java | |
| parent | bcad61f83313b7ed73f56db39371491abe38e267 (diff) | |
| download | vaadin-framework-82120d5db9eee301143e234d0217b0083b8c97ec.tar.gz vaadin-framework-82120d5db9eee301143e234d0217b0083b8c97ec.zip | |
Support for all valid CSS selectors (#10316)
Add support for pseudo-functions like ":nth-child(n)".
Add support for sibling selector "E ~ F".
Add support for unknown pseudo-functions taking an identifier such as
":not(s)".
Change-Id: I39b31fa99f031b31b215058a45b74e40b23191f3
Diffstat (limited to 'theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java')
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java | 1327 |
1 files changed, 664 insertions, 663 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java index 6715e3beda..57b6745996 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java @@ -37,170 +37,170 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) switch (pos) { case 0: - if ((active0 & 0xfff0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L) + if ((active0 & 0xffe0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) return 111; if ((active0 & 0x10000L) != 0L) return 79; - if ((active0 & 0xe000000000000L) != 0L || (active1 & 0x8L) != 0L) - { - jjmatchedKind = 70; + if ((active0 & 0x100000000L) != 0L) return 441; - } - if ((active0 & 0x80000000L) != 0L) + if ((active0 & 0x4000000000L) != 0L) return 442; - if ((active0 & 0x2000000000L) != 0L) + if ((active0 & 0x1c000000000000L) != 0L || (active1 & 0x10L) != 0L) + { + jjmatchedKind = 71; return 443; - if ((active0 & 0x4000044L) != 0L) + } + if ((active0 & 0x8000044L) != 0L) return 3; if ((active0 & 0x200800L) != 0L) return 42; return -1; case 1: - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0xffe0000000000000L) != 0L || (active1 & 0x7c0000005L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 99; jjmatchedPos = 1; - return 441; + return 444; } - if ((active1 & 0x1L) != 0L) - return 112; - if ((active0 & 0xa000000000000L) != 0L || (active1 & 0x8L) != 0L) - return 441; - if ((active0 & 0xfff0000000000000L) != 0L || (active1 & 0x3e0000002L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 71; jjmatchedPos = 1; - return 444; + return 443; } + if ((active1 & 0x2L) != 0L) + return 112; + if ((active0 & 0x14000000000000L) != 0L || (active1 & 0x10L) != 0L) + return 443; if ((active0 & 0x40L) != 0L) return 1; return -1; case 2: - if ((active0 & 0xdff0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L) + if ((active0 & 0x4000000000000000L) != 0L) + return 444; + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 71; jjmatchedPos = 2; - return 444; + return 443; } - if ((active0 & 0x2000000000000000L) != 0L) - return 444; - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0xbfe0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 99; jjmatchedPos = 2; - return 441; + return 444; } return -1; case 3: - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 71; jjmatchedPos = 3; - return 441; + return 443; } - if ((active0 & 0xdbf0000000000000L) != 0L || (active1 & 0x3e0000003L) != 0L) + if ((active0 & 0x800000000000000L) != 0L) + return 444; + if ((active0 & 0xb7e0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 3; return 444; } - if ((active0 & 0x400000000000000L) != 0L) - return 444; return -1; case 4: - if ((active0 & 0x91f0000000000000L) != 0L || (active1 & 0x2e0000003L) != 0L) + if ((active0 & 0x9400000000000000L) != 0L || (active1 & 0x200000000L) != 0L) + return 444; + if ((active0 & 0x23e0000000000000L) != 0L || (active1 & 0x5c0000007L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 4; return 444; } - if ((active0 & 0x4a00000000000000L) != 0L || (active1 & 0x100000000L) != 0L) - return 444; - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 71; jjmatchedPos = 4; - return 441; + return 443; } return -1; case 5: - if ((active0 & 0x1110000000000000L) != 0L || (active1 & 0x40000000L) != 0L) - return 444; - if ((active0 & 0x80e0000000000000L) != 0L || (active1 & 0x2a0000003L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 71; jjmatchedPos = 5; - return 444; + return 443; } - if ((active0 & 0x4000000000000L) != 0L) + if ((active0 & 0x1c0000000000000L) != 0L || (active1 & 0x540000007L) != 0L) { - jjmatchedKind = 70; + jjmatchedKind = 99; jjmatchedPos = 5; - return 441; + return 444; } + if ((active0 & 0x2220000000000000L) != 0L || (active1 & 0x80000000L) != 0L) + return 444; return -1; case 6: - if ((active0 & 0x4000000000000L) != 0L) - return 441; - if ((active0 & 0x8080000000000000L) != 0L || (active1 & 0x20000000L) != 0L) - return 444; - if ((active0 & 0x60000000000000L) != 0L || (active1 & 0x280000003L) != 0L) + if ((active0 & 0xc0000000000000L) != 0L || (active1 & 0x500000006L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 6; return 444; } + if ((active0 & 0x8000000000000L) != 0L) + return 443; + if ((active0 & 0x100000000000000L) != 0L || (active1 & 0x40000001L) != 0L) + return 444; return -1; case 7: - if ((active0 & 0x20000000000000L) != 0L || (active1 & 0x80000000L) != 0L) - return 444; - if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x200000003L) != 0L) + if ((active0 & 0x80000000000000L) != 0L || (active1 & 0x400000006L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 7; return 444; } + if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x100000000L) != 0L) + return 444; return -1; case 8: - if ((active1 & 0x200000001L) != 0L) + if ((active0 & 0x80000000000000L) != 0L || (active1 & 0x4L) != 0L) + return 444; + if ((active1 & 0x400000002L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 8; return 444; } - if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x2L) != 0L) - return 444; return -1; case 9: - if ((active1 & 0x1L) != 0L) + if ((active1 & 0x400000000L) != 0L) + return 444; + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 9; return 444; } - if ((active1 & 0x200000000L) != 0L) - return 444; return -1; case 10: - if ((active1 & 0x1L) != 0L) + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 10; return 444; } return -1; case 11: - if ((active1 & 0x1L) != 0L) + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 11; return 444; } return -1; case 12: - if ((active1 & 0x1L) != 0L) + if ((active1 & 0x2L) != 0L) { - jjmatchedKind = 98; + jjmatchedKind = 99; jjmatchedPos = 12; return 444; } @@ -224,18 +224,18 @@ private int jjMoveStringLiteralDfa0_0() switch(curChar) { case 33: - return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L); case 36: return jjMoveStringLiteralDfa1_0(0x10000L, 0x0L); case 38: - jjmatchedKind = 30; - return jjMoveStringLiteralDfa1_0(0x1000000000L, 0x0L); + jjmatchedKind = 31; + return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L); case 40: - return jjStopAtPos(0, 32); - case 41: return jjStopAtPos(0, 33); + case 41: + return jjStopAtPos(0, 34); case 42: - jjmatchedKind = 29; + jjmatchedKind = 30; return jjMoveStringLiteralDfa1_0(0x20000L, 0x0L); case 43: return jjStopAtPos(0, 20); @@ -245,43 +245,44 @@ private int jjMoveStringLiteralDfa0_0() jjmatchedKind = 21; return jjMoveStringLiteralDfa1_0(0x800L, 0x0L); case 46: - return jjStartNfaWithStates_0(0, 31, 442); + return jjStartNfaWithStates_0(0, 32, 441); case 47: - jjmatchedKind = 26; + jjmatchedKind = 27; return jjMoveStringLiteralDfa1_0(0x44L, 0x0L); case 58: - return jjStopAtPos(0, 38); + return jjStopAtPos(0, 39); case 59: return jjStopAtPos(0, 23); case 60: - jjmatchedKind = 25; + jjmatchedKind = 26; return jjMoveStringLiteralDfa1_0(0x400L, 0x0L); case 61: jjmatchedKind = 19; - return jjMoveStringLiteralDfa1_0(0x400000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x800000000L, 0x0L); case 62: return jjStopAtPos(0, 24); case 64: - return jjMoveStringLiteralDfa1_0(0xfff0000000000000L, 0x3e0000003L); + return jjMoveStringLiteralDfa1_0(0xffe0000000000000L, 0x7c0000007L); case 91: - return jjStopAtPos(0, 27); - case 93: return jjStopAtPos(0, 28); + case 93: + return jjStopAtPos(0, 29); case 94: return jjMoveStringLiteralDfa1_0(0x8000L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x8L); + return jjMoveStringLiteralDfa1_0(0x10000000000000L, 0x10L); case 84: case 116: - return jjMoveStringLiteralDfa1_0(0x6000000000000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0xc000000000000L, 0x0L); case 123: return jjStopAtPos(0, 12); case 124: - return jjMoveStringLiteralDfa1_0(0x800004000L, 0x0L); + return jjMoveStringLiteralDfa1_0(0x1000004000L, 0x0L); case 125: return jjStopAtPos(0, 13); case 126: + jjmatchedKind = 25; return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L); default : return jjMoveNfa_0(4, 0); @@ -299,15 +300,15 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) case 33: return jjMoveStringLiteralDfa2_0(active0, 0x400L, active1, 0L); case 38: - if ((active0 & 0x1000000000L) != 0L) - return jjStopAtPos(1, 36); + if ((active0 & 0x2000000000L) != 0L) + return jjStopAtPos(1, 37); break; case 42: if ((active0 & 0x40L) != 0L) return jjStartNfaWithStates_0(1, 6, 1); break; case 45: - return jjMoveStringLiteralDfa2_0(active0, 0x800L, active1, 0x1L); + return jjMoveStringLiteralDfa2_0(active0, 0x800L, active1, 0x2L); case 47: if ((active0 & 0x4L) != 0L) return jjStopAtPos(1, 2); @@ -323,59 +324,59 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) return jjStopAtPos(1, 17); else if ((active0 & 0x40000L) != 0L) return jjStopAtPos(1, 18); - else if ((active0 & 0x400000000L) != 0L) - return jjStopAtPos(1, 34); - else if ((active0 & 0x2000000000L) != 0L) - return jjStopAtPos(1, 37); + else if ((active0 & 0x800000000L) != 0L) + return jjStopAtPos(1, 35); + else if ((active0 & 0x4000000000L) != 0L) + return jjStopAtPos(1, 38); break; case 67: case 99: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000000L); case 68: case 100: - return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_0(active0, 0xc800000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x9000000000000000L, active1, 0x1L); case 70: case 102: - if ((active1 & 0x8L) != 0L) - return jjStartNfaWithStates_0(1, 67, 441); - return jjMoveStringLiteralDfa2_0(active0, 0x440000000000000L, active1, 0x200000000L); + if ((active1 & 0x10L) != 0L) + return jjStartNfaWithStates_0(1, 68, 443); + return jjMoveStringLiteralDfa2_0(active0, 0x880000000000000L, active1, 0x400000000L); case 72: case 104: - return jjMoveStringLiteralDfa2_0(active0, 0x4000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_0(active0, 0x2020000000000000L, active1, 0x20000000L); + return jjMoveStringLiteralDfa2_0(active0, 0x4040000000000000L, active1, 0x40000000L); case 77: case 109: - return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0x40000000L); + return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 0x80000000L); case 78: case 110: - if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_0(1, 51, 441); + if ((active0 & 0x10000000000000L) != 0L) + return jjStartNfaWithStates_0(1, 52, 443); break; case 79: case 111: - if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(1, 49, 441); + if ((active0 & 0x4000000000000L) != 0L) + return jjStartNfaWithStates_0(1, 50, 443); break; case 80: case 112: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000L); case 82: case 114: - return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4L); case 87: case 119: - return jjMoveStringLiteralDfa2_0(active0, 0x1200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x2400000000000000L, active1, 0L); case 124: - if ((active0 & 0x800000000L) != 0L) - return jjStopAtPos(1, 35); + if ((active0 & 0x1000000000L) != 0L) + return jjStopAtPos(1, 36); break; default : break; @@ -401,42 +402,42 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a break; case 65: case 97: - return jjMoveStringLiteralDfa3_0(active0, 0xa00000000000000L, active1, 0x100000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x1400000000000000L, active1, 0x200000000L); case 69: case 101: - return jjMoveStringLiteralDfa3_0(active0, 0x180000000000000L, active1, 0x40000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x300000000000000L, active1, 0x80000000L); case 70: case 102: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_0(2, 61, 444); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_0(2, 62, 444); break; case 72: case 104: - return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L, active1, 0x80000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000000L, active1, 0x100000000L); case 73: case 105: - return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0L); case 77: case 109: - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20000001L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000002L); case 78: case 110: - return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_0(active0, 0x400000000000000L, active1, 0x200000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L, active1, 0x400000000L); case 82: case 114: - return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x2L); + return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x4L); case 88: case 120: - return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1L); default : break; } @@ -459,45 +460,45 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a break; case 65: case 97: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L); case 66: case 98: - return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa4_0(active0, 0x820000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x1040000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L); case 71: case 103: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000L); case 73: case 105: - return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000000L, active1, 0L); case 78: case 110: - return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0x200000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x400000000L); case 79: case 111: - return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x2L); case 80: case 112: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000002L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000004L); case 82: case 114: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 58, 444); - return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0L); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_0(3, 59, 444); + return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0L); case 84: case 116: - return jjMoveStringLiteralDfa4_0(active0, 0x8080000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0x1L); case 88: case 120: - return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L); default : break; } @@ -516,48 +517,48 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a { case 67: case 99: - return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 62, 444); - else if ((active1 & 0x100000000L) != 0L) - return jjStartNfaWithStates_0(4, 96, 444); - return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0L); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 63, 444); + else if ((active1 & 0x200000000L) != 0L) + return jjStartNfaWithStates_0(4, 97, 444); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L); case 72: case 104: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 59, 444); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 60, 444); break; case 73: case 105: - return jjMoveStringLiteralDfa5_0(active0, 0x10000000000000L, active1, 0x40000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L, active1, 0x80000000L); case 76: case 108: - return jjMoveStringLiteralDfa5_0(active0, 0x1020000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x2040000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 57, 444); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 58, 444); break; case 79: case 111: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x20000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000L); case 80: case 112: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4L); case 82: case 114: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000L); case 84: case 116: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L); case 85: case 117: - return jjMoveStringLiteralDfa5_0(active0, 0x184000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x308000000000000L, active1, 0L); case 90: case 122: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L); default : break; } @@ -575,42 +576,42 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a switch(curChar) { case 45: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000001L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000002L); case 65: case 97: - if ((active1 & 0x40000000L) != 0L) - return jjStartNfaWithStates_0(5, 94, 444); + if ((active1 & 0x80000000L) != 0L) + return jjStartNfaWithStates_0(5, 95, 444); break; case 69: case 101: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 60, 444); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 61, 444); break; case 71: case 103: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 56, 444); - return jjMoveStringLiteralDfa6_0(active0, 0x4000000000000L, active1, 0L); + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 57, 444); + return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 52, 444); - return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0L); + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 53, 444); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1L); case 79: case 111: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4L); case 82: case 114: - return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0x20000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0x40000000L); case 83: case 115: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L); case 84: case 116: - return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L, active1, 0L); default : break; } @@ -629,35 +630,35 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a { case 68: case 100: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 63, 444); - return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L, active1, 0x1L); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_0(6, 64, 444); + return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L, active1, 0x2L); case 69: case 101: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000L); case 70: case 102: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000000L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400000000L); case 72: case 104: - if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 50, 441); + if ((active0 & 0x8000000000000L) != 0L) + return jjStartNfaWithStates_0(6, 51, 443); break; case 73: case 105: - return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 55, 444); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_0(6, 56, 444); break; case 82: case 114: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4L); case 84: case 116: - if ((active1 & 0x20000000L) != 0L) - return jjStartNfaWithStates_0(6, 93, 444); + if ((active1 & 0x40000000L) != 0L) + return jjStartNfaWithStates_0(6, 94, 444); break; default : break; @@ -677,20 +678,20 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a { case 65: case 97: - return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x200000000L); + return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x400000000L); case 69: case 101: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(7, 53, 444); + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_0(7, 54, 444); break; case 79: case 111: - return jjMoveStringLiteralDfa8_0(active0, 0x40000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa8_0(active0, 0x80000000000000L, active1, 0x2L); case 84: case 116: - if ((active1 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(7, 95, 444); - return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x2L); + if ((active1 & 0x100000000L) != 0L) + return jjStartNfaWithStates_0(7, 96, 444); + return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4L); default : break; } @@ -709,16 +710,16 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a { case 67: case 99: - return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x200000001L); + return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x400000002L); case 78: case 110: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_0(8, 54, 444); + if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_0(8, 55, 444); break; case 83: case 115: - if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_0(8, 65, 444); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_0(8, 66, 444); break; default : break; @@ -738,12 +739,12 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a { case 69: case 101: - if ((active1 & 0x200000000L) != 0L) - return jjStartNfaWithStates_0(9, 97, 444); + if ((active1 & 0x400000000L) != 0L) + return jjStartNfaWithStates_0(9, 98, 444); break; case 85: case 117: - return jjMoveStringLiteralDfa10_0(active1, 0x1L); + return jjMoveStringLiteralDfa10_0(active1, 0x2L); default : break; } @@ -762,7 +763,7 @@ private int jjMoveStringLiteralDfa10_0(long old1, long active1) { case 77: case 109: - return jjMoveStringLiteralDfa11_0(active1, 0x1L); + return jjMoveStringLiteralDfa11_0(active1, 0x2L); default : break; } @@ -781,7 +782,7 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1) { case 69: case 101: - return jjMoveStringLiteralDfa12_0(active1, 0x1L); + return jjMoveStringLiteralDfa12_0(active1, 0x2L); default : break; } @@ -800,7 +801,7 @@ private int jjMoveStringLiteralDfa12_0(long old1, long active1) { case 78: case 110: - return jjMoveStringLiteralDfa13_0(active1, 0x1L); + return jjMoveStringLiteralDfa13_0(active1, 0x2L); default : break; } @@ -819,8 +820,8 @@ private int jjMoveStringLiteralDfa13_0(long old1, long active1) { case 84: case 116: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_0(13, 64, 444); + if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_0(13, 65, 444); break; default : break; @@ -856,7 +857,7 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 442: + case 441: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(0, 4); if ((0x3ff000000000000L & l) != 0L) @@ -893,8 +894,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(205, 206); if ((0x3ff000000000000L & l) != 0L) { - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAdd(204); } break; @@ -902,7 +903,7 @@ private int jjMoveNfa_0(int startState, int curPos) if (curChar == 45) jjCheckNAdd(80); break; - case 443: + case 442: if ((0x100003600L & l) != 0L) jjCheckNAddTwoStates(189, 198); if ((0x100003600L & l) != 0L) @@ -912,24 +913,24 @@ private int jjMoveNfa_0(int startState, int curPos) case 113: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; - case 441: + case 443: if ((0x3ff200000000000L & l) != 0L) jjCheckNAddStates(5, 8); else if ((0x100003600L & l) != 0L) jjCheckNAddTwoStates(169, 170); else if (curChar == 40) { - if (kind > 113) - kind = 113; + if (kind > 114) + kind = 114; } if ((0x3ff200000000000L & l) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); } break; @@ -940,8 +941,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 4: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(9, 82); } else if ((0x100003600L & l) != 0L) @@ -1079,8 +1080,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(115, 118); break; case 46: - if (curChar == 34 && kind > 69) - kind = 69; + if (curChar == 34 && kind > 70) + kind = 70; break; case 48: if (curChar == 12) @@ -1139,8 +1140,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(111, 114); break; case 63: - if (curChar == 39 && kind > 69) - kind = 69; + if (curChar == 39 && kind > 70) + kind = 70; break; case 65: if (curChar == 12) @@ -1197,106 +1198,106 @@ private int jjMoveNfa_0(int startState, int curPos) case 81: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 83: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 84: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(278, 281); break; case 85: if ((0x100003600L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 86: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(282, 288); break; case 87: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(289, 291); break; case 88: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(292, 295); break; case 89: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(296, 300); break; case 90: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(301, 306); break; case 93: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(307, 310); break; case 94: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(311, 317); break; case 95: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(318, 320); break; case 96: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(321, 324); break; case 97: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(325, 329); break; case 98: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(330, 335); break; case 99: @@ -1306,162 +1307,162 @@ private int jjMoveNfa_0(int startState, int curPos) case 100: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 102: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 103: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(336, 339); break; case 104: if ((0x100003600L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 105: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(340, 346); break; case 106: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(347, 349); break; case 107: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(350, 353); break; case 108: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(354, 358); break; case 109: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(359, 364); break; case 115: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 116: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(365, 368); break; case 117: if ((0x100003600L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 118: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(369, 375); break; case 119: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(376, 378); break; case 120: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(379, 382); break; case 121: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(383, 387); break; case 122: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(388, 393); break; case 125: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(394, 397); break; case 126: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(398, 404); break; case 127: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(405, 407); break; case 128: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(408, 411); break; case 129: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(412, 416); break; case 130: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(417, 422); break; case 132: @@ -1469,86 +1470,86 @@ private int jjMoveNfa_0(int startState, int curPos) jjAddStates(423, 424); break; case 133: - if (curChar == 40 && kind > 110) - kind = 110; + if (curChar == 40 && kind > 111) + kind = 111; break; case 140: if ((0x100003600L & l) != 0L) jjAddStates(425, 426); break; case 141: - if (curChar == 40 && kind > 111) - kind = 111; + if (curChar == 40 && kind > 112) + kind = 112; break; case 148: if ((0x100003600L & l) != 0L) jjAddStates(427, 428); break; case 149: - if (curChar == 40 && kind > 112) - kind = 112; + if (curChar == 40 && kind > 113) + kind = 113; break; case 158: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 160: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 161: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(429, 432); break; case 162: if ((0x100003600L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 163: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(433, 439); break; case 164: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(440, 442); break; case 165: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(443, 446); break; case 166: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(447, 451); break; case 167: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(452, 457); break; case 168: @@ -1560,8 +1561,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(169, 170); break; case 170: - if (curChar == 40 && kind > 113) - kind = 113; + if (curChar == 40 && kind > 114) + kind = 114; break; case 172: if ((0xffffffff00000000L & l) != 0L) @@ -1619,8 +1620,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 204: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAdd(204); break; case 205: @@ -1628,8 +1629,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(205, 206); break; case 206: - if (curChar == 37 && kind > 75) - kind = 75; + if (curChar == 37 && kind > 76) + kind = 76; break; case 207: if ((0x3ff000000000000L & l) != 0L) @@ -1702,106 +1703,106 @@ private int jjMoveNfa_0(int startState, int curPos) case 259: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 261: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 262: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(493, 496); break; case 263: if ((0x100003600L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 264: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(497, 503); break; case 265: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(504, 506); break; case 266: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(507, 510); break; case 267: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(511, 515); break; case 268: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(516, 521); break; case 271: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(522, 525); break; case 272: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(526, 532); break; case 273: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(533, 535); break; case 274: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(536, 539); break; case 275: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(540, 544); break; case 276: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(545, 550); break; case 278: @@ -1817,8 +1818,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(280, 281); break; case 281: - if (curChar == 41 && kind > 73) - kind = 73; + if (curChar == 41 && kind > 74) + kind = 74; break; case 283: if ((0xffffffff00000000L & l) != 0L) @@ -1983,20 +1984,20 @@ private int jjMoveNfa_0(int startState, int curPos) case 329: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 330; break; case 330: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(695, 698); break; case 331: - if (curChar == 63 && kind > 109) - kind = 109; + if (curChar == 63 && kind > 110) + kind = 110; break; case 332: case 347: @@ -2005,29 +2006,29 @@ private int jjMoveNfa_0(int startState, int curPos) case 357: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAdd(331); break; case 333: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(331, 332); break; case 334: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(699, 701); break; case 335: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjAddStates(702, 707); break; case 336: @@ -2043,8 +2044,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(339); break; case 339: - if ((0x3ff000000000000L & l) != 0L && kind > 109) - kind = 109; + if ((0x3ff000000000000L & l) != 0L && kind > 110) + kind = 110; break; case 340: if ((0x3ff000000000000L & l) != 0L) @@ -2061,8 +2062,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 343: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAdd(331); break; case 344: @@ -2076,8 +2077,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 346: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 347; break; case 348: @@ -2087,57 +2088,57 @@ private int jjMoveNfa_0(int startState, int curPos) case 349: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 350; break; case 350: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(331, 351); break; case 352: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 353; break; case 353: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(708, 710); break; case 355: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(331, 354); break; case 356: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(711, 714); break; case 358: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(331, 357); break; case 359: if (curChar != 63) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(715, 717); break; case 360: @@ -2155,36 +2156,36 @@ private int jjMoveNfa_0(int startState, int curPos) case 363: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 364; break; case 364: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(718, 721); break; case 365: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAdd(339); break; case 366: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(339, 365); break; case 367: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(722, 724); break; case 368: @@ -2210,43 +2211,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 374: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(737, 740); break; case 375: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(741, 747); break; case 376: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(748, 750); break; case 377: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(751, 754); break; case 378: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(755, 759); break; case 379: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(760, 765); break; case 380: @@ -2272,15 +2273,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 386: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(9, 82); break; case 387: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAdd(387); break; case 388: @@ -2511,8 +2512,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(5, 8); if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); } if ((0x200000002000L & l) != 0L) @@ -2521,14 +2522,14 @@ private int jjMoveNfa_0(int startState, int curPos) case 79: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); } else if (curChar == 92) jjCheckNAddTwoStates(83, 93); break; - case 443: + case 442: if ((0x20000000200L & l) != 0L) jjstateSet[jjnewStateCnt++] = 197; else if ((0x1000000010L & l) != 0L) @@ -2537,22 +2538,22 @@ private int jjMoveNfa_0(int startState, int curPos) case 444: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); } else if (curChar == 92) jjCheckNAddTwoStates(115, 116); break; - case 441: + case 443: if ((0x7fffffe87fffffeL & l) != 0L) jjCheckNAddStates(5, 8); else if (curChar == 92) jjCheckNAddTwoStates(160, 161); if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); } else if (curChar == 92) @@ -2561,8 +2562,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 111: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); } else if (curChar == 92) @@ -2571,8 +2572,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 4: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(802, 807); } else if (curChar == 92) @@ -2607,8 +2608,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(123, 125); break; case 10: - if (curChar == 125 && kind > 39) - kind = 39; + if (curChar == 125 && kind > 40) + kind = 40; break; case 11: if (curChar == 92) @@ -2671,8 +2672,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(189, 195); break; case 29: - if ((0x4000000040000L & l) != 0L && kind > 66) - kind = 66; + if ((0x4000000040000L & l) != 0L && kind > 67) + kind = 67; break; case 30: case 35: @@ -2792,15 +2793,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 80: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 81: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 82: @@ -2810,50 +2811,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 83: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 84: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(278, 281); break; case 86: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(282, 288); break; case 87: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(289, 291); break; case 88: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(292, 295); break; case 89: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(296, 300); break; case 90: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(301, 306); break; case 92: @@ -2863,50 +2864,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 93: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(307, 310); break; case 94: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(311, 317); break; case 95: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(318, 320); break; case 96: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(321, 324); break; case 97: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(325, 329); break; case 98: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddStates(330, 335); break; case 100: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 101: @@ -2916,50 +2917,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 102: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 103: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(336, 339); break; case 105: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(340, 346); break; case 106: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(347, 349); break; case 107: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(350, 353); break; case 108: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(354, 358); break; case 109: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(359, 364); break; case 110: @@ -2969,15 +2970,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 112: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 113: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 114: @@ -2987,50 +2988,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 115: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 116: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(365, 368); break; case 118: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(369, 375); break; case 119: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(376, 378); break; case 120: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(379, 382); break; case 121: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(383, 387); break; case 122: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(388, 393); break; case 124: @@ -3040,43 +3041,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 125: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(394, 397); break; case 126: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(398, 404); break; case 127: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(405, 407); break; case 128: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(408, 411); break; case 129: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(412, 416); break; case 130: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddStates(417, 422); break; case 131: @@ -3162,8 +3163,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 158: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 159: @@ -3173,50 +3174,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 160: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 161: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(429, 432); break; case 163: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(433, 439); break; case 164: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(440, 442); break; case 165: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(443, 446); break; case 166: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(447, 451); break; case 167: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(452, 457); break; case 168: @@ -3257,8 +3258,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(486, 492); break; case 182: - if ((0x10000000100000L & l) != 0L && kind > 68) - kind = 68; + if ((0x10000000100000L & l) != 0L && kind > 69) + kind = 69; break; case 183: if ((0x100000001000L & l) != 0L) @@ -3285,8 +3286,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 187; break; case 190: - if ((0x10000000100000L & l) != 0L && kind > 99) - kind = 99; + if ((0x10000000100000L & l) != 0L && kind > 100) + kind = 100; break; case 191: if ((0x400000004000L & l) != 0L) @@ -3323,8 +3324,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 200: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 201: @@ -3334,77 +3335,77 @@ private int jjMoveNfa_0(int startState, int curPos) case 202: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(802, 807); break; case 208: - if ((0x10000000100000L & l) != 0L && kind > 76) - kind = 76; + if ((0x10000000100000L & l) != 0L && kind > 77) + kind = 77; break; case 209: if ((0x1000000010000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 208; break; case 211: - if ((0x200000002000L & l) != 0L && kind > 77) - kind = 77; + if ((0x200000002000L & l) != 0L && kind > 78) + kind = 78; break; case 212: if ((0x200000002000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 211; break; case 214: - if ((0x200000002000L & l) != 0L && kind > 78) - kind = 78; + if ((0x200000002000L & l) != 0L && kind > 79) + kind = 79; break; case 215: if ((0x800000008L & l) != 0L) jjstateSet[jjnewStateCnt++] = 214; break; case 217: - if ((0x800000008L & l) != 0L && kind > 79) - kind = 79; + if ((0x800000008L & l) != 0L && kind > 80) + kind = 80; break; case 218: if ((0x1000000010000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 217; break; case 220: - if ((0x400000004000L & l) != 0L && kind > 80) - kind = 80; + if ((0x400000004000L & l) != 0L && kind > 81) + kind = 81; break; case 221: if ((0x20000000200L & l) != 0L) jjstateSet[jjnewStateCnt++] = 220; break; case 223: - if ((0x100000001000000L & l) != 0L && kind > 81) - kind = 81; + if ((0x100000001000000L & l) != 0L && kind > 82) + kind = 82; break; case 224: if ((0x1000000010000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 223; break; case 226: - if ((0x200000002000L & l) != 0L && kind > 82) - kind = 82; + if ((0x200000002000L & l) != 0L && kind > 83) + kind = 83; break; case 227: if ((0x2000000020L & l) != 0L) jjstateSet[jjnewStateCnt++] = 226; break; case 229: - if ((0x100000001000000L & l) != 0L && kind > 83) - kind = 83; + if ((0x100000001000000L & l) != 0L && kind > 84) + kind = 84; break; case 230: if ((0x2000000020L & l) != 0L) jjstateSet[jjnewStateCnt++] = 229; break; case 232: - if ((0x8000000080L & l) != 0L && kind > 84) - kind = 84; + if ((0x8000000080L & l) != 0L && kind > 85) + kind = 85; break; case 233: if ((0x2000000020L & l) != 0L) @@ -3415,8 +3416,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 233; break; case 236: - if ((0x1000000010L & l) != 0L && kind > 85) - kind = 85; + if ((0x1000000010L & l) != 0L && kind > 86) + kind = 86; break; case 237: if ((0x200000002L & l) != 0L) @@ -3427,8 +3428,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 237; break; case 240: - if ((0x1000000010L & l) != 0L && kind > 86) - kind = 86; + if ((0x1000000010L & l) != 0L && kind > 87) + kind = 87; break; case 241: if ((0x200000002L & l) != 0L) @@ -3443,28 +3444,28 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 242; break; case 245: - if ((0x8000000080000L & l) != 0L && kind > 87) - kind = 87; + if ((0x8000000080000L & l) != 0L && kind > 88) + kind = 88; break; case 246: if ((0x200000002000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 245; break; case 248: - if ((0x8000000080000L & l) != 0L && kind > 88) - kind = 88; + if ((0x8000000080000L & l) != 0L && kind > 89) + kind = 89; break; case 250: - if ((0x400000004000000L & l) != 0L && kind > 89) - kind = 89; + if ((0x400000004000000L & l) != 0L && kind > 90) + kind = 90; break; case 251: if ((0x10000000100L & l) != 0L) jjstateSet[jjnewStateCnt++] = 250; break; case 253: - if ((0x400000004000000L & l) != 0L && kind > 90) - kind = 90; + if ((0x400000004000000L & l) != 0L && kind > 91) + kind = 91; break; case 254: if ((0x10000000100L & l) != 0L) @@ -3477,15 +3478,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 258: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 259: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 260: @@ -3495,50 +3496,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 261: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 262: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(493, 496); break; case 264: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(497, 503); break; case 265: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(504, 506); break; case 266: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(507, 510); break; case 267: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(511, 515); break; case 268: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(516, 521); break; case 270: @@ -3548,43 +3549,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 271: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(522, 525); break; case 272: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(526, 532); break; case 273: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(533, 535); break; case 274: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(536, 539); break; case 275: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(540, 544); break; case 276: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddStates(545, 550); break; case 277: @@ -3709,8 +3710,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 335: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjAddStates(702, 707); break; case 336: @@ -3726,8 +3727,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(339); break; case 339: - if ((0x7e0000007eL & l) != 0L && kind > 109) - kind = 109; + if ((0x7e0000007eL & l) != 0L && kind > 110) + kind = 110; break; case 340: if ((0x7e0000007eL & l) != 0L) @@ -3744,8 +3745,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 343: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 331; break; case 344: @@ -3759,8 +3760,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 346: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 347; break; case 348: @@ -3770,15 +3771,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 349: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 350; break; case 352: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 353; break; case 361: @@ -3788,36 +3789,36 @@ private int jjMoveNfa_0(int startState, int curPos) case 363: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjstateSet[jjnewStateCnt++] = 364; break; case 364: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(718, 721); break; case 365: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAdd(339); break; case 366: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddTwoStates(339, 365); break; case 367: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 109) - kind = 109; + if (kind > 110) + kind = 110; jjCheckNAddStates(722, 724); break; case 368: @@ -3847,43 +3848,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 374: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(737, 740); break; case 375: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(741, 747); break; case 376: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(748, 750); break; case 377: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(751, 754); break; case 378: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(755, 759); break; case 379: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddStates(760, 765); break; case 380: @@ -3923,8 +3924,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 83: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 74) - kind = 74; + if (kind > 75) + kind = 75; jjCheckNAddTwoStates(81, 82); break; case 444: @@ -3932,15 +3933,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 115: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; - case 441: + case 443: if ((jjbitVec0[i2] & l2) != 0L) { - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); } if ((jjbitVec0[i2] & l2) != 0L) @@ -3949,15 +3950,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 111: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 98) - kind = 98; + if (kind > 99) + kind = 99; jjCheckNAddTwoStates(113, 114); break; case 4: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 40) - kind = 40; + if (kind > 41) + kind = 41; jjCheckNAddStates(802, 807); break; case 2: @@ -3984,16 +3985,16 @@ private int jjMoveNfa_0(int startState, int curPos) case 102: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddTwoStates(100, 101); break; case 158: case 160: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 70) - kind = 70; + if (kind > 71) + kind = 71; jjCheckNAddTwoStates(158, 159); break; case 168: @@ -4006,8 +4007,8 @@ private int jjMoveNfa_0(int startState, int curPos) case 269: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 92) + kind = 92; jjCheckNAddTwoStates(259, 260); break; case 279: @@ -4251,14 +4252,14 @@ static final int[] jjnextStates = { public static final String[] jjstrLiteralImages = { "", null, null, null, null, null, null, null, null, null, "\74\41\55\55", "\55\55\76", "\173", "\175", "\174\75", "\136\75", "\44\75", "\52\75", "\176\75", "\75", -"\53", "\55", "\54", "\73", "\76", "\74", "\57", "\133", "\135", "\52", "\46", "\56", -"\50", "\51", "\75\75", "\174\174", "\46\46", "\41\75", "\72", null, null, null, null, +"\53", "\55", "\54", "\73", "\76", "\176", "\74", "\57", "\133", "\135", "\52", +"\46", "\56", "\50", "\51", "\75\75", "\174\174", "\46\46", "\41\75", "\72", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 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, }; /** Lexer state names. */ public static final String[] lexStateNames = { @@ -4274,10 +4275,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, }; static final long[] jjtoToken = { - 0xfffe01fffffffc03L, 0x7e00ffffffeffL, + 0xfffc03fffffffc03L, 0xfc01ffffffdffL, }; static final long[] jjtoSkip = { 0x190L, 0x0L, @@ -4403,9 +4404,9 @@ public Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); - if (jjmatchedPos == 0 && jjmatchedKind > 114) + if (jjmatchedPos == 0 && jjmatchedKind > 115) { - jjmatchedKind = 114; + jjmatchedKind = 115; } break; case 1: |