From: Marc Englund Date: Thu, 6 Sep 2012 07:48:19 +0000 (+0300) Subject: Applied patch for #9414 - allow space between @mixin and parentheses. (includes gener... X-Git-Tag: 7.0.0.beta1~175 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=36824087ab6daf23f6d06018aed1d21d13249289;p=vaadin-framework.git Applied patch for #9414 - allow space between @mixin and parentheses. (includes generated sources) --- diff --git a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java index c31dd78970..0ed8b8d0f2 100644 --- a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java +++ b/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java @@ -252,7 +252,7 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler { @Override public void startMixinDirective(String name, Collection args) { - MixinDefNode node = new MixinDefNode(name, args); + MixinDefNode node = new MixinDefNode(name.trim(), args); nodeStack.peek().appendChild(node); nodeStack.push(node); } diff --git a/sass/src/com/vaadin/sass/parser/Parser.jj b/sass/src/com/vaadin/sass/parser/Parser.jj index 86c8a9150d..717094a763 100644 --- a/sass/src/com/vaadin/sass/parser/Parser.jj +++ b/sass/src/com/vaadin/sass/parser/Parser.jj @@ -664,7 +664,7 @@ TOKEN : TOKEN : { - < FUNCTION : "(" > + < FUNCTION : (< S >)* "(" > } diff --git a/sass/src/com/vaadin/sass/parser/ParserTokenManager.java b/sass/src/com/vaadin/sass/parser/ParserTokenManager.java index d91727a37c..7c176f2262 100644 --- a/sass/src/com/vaadin/sass/parser/ParserTokenManager.java +++ b/sass/src/com/vaadin/sass/parser/ParserTokenManager.java @@ -38,18 +38,18 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) { case 0: if ((active0 & 0x8000000L) != 0L) - return 399; + return 400; if ((active0 & 0x40800L) != 0L) - return 158; + return 159; if ((active0 & 0x3fff00000000000L) != 0L || (active1 & 0xf80000L) != 0L) return 96; + if ((active0 & 0x400044L) != 0L) + return 3; if ((active0 & 0xe0000000000L) != 0L) { jjmatchedKind = 60; - return 400; + return 401; } - if ((active0 & 0x400044L) != 0L) - return 3; return -1; case 1: if ((active0 & 0x100000000000000L) != 0L) @@ -58,123 +58,123 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) { jjmatchedKind = 60; jjmatchedPos = 1; - return 400; + return 401; } if ((active0 & 0xa0000000000L) != 0L) - return 400; + return 401; if ((active0 & 0x40L) != 0L) return 1; if ((active0 & 0x2fff00000000000L) != 0L || (active1 & 0xf80000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 1; - return 401; + return 402; } return -1; case 2: if ((active0 & 0x20000000000000L) != 0L) - return 401; + return 402; if ((active0 & 0x3dff00000000000L) != 0L || (active1 & 0xf80000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 2; - return 401; + return 402; } if ((active0 & 0x40000000000L) != 0L) { jjmatchedKind = 60; jjmatchedPos = 2; - return 400; + return 401; } return -1; case 3: if ((active0 & 0x4000000000000L) != 0L) - return 401; + return 402; if ((active0 & 0x3dbf00000000000L) != 0L || (active1 & 0xf80000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 3; - return 401; + return 402; } if ((active0 & 0x40000000000L) != 0L) { jjmatchedKind = 60; jjmatchedPos = 3; - return 400; + return 401; } return -1; case 4: if ((active0 & 0x4a000000000000L) != 0L || (active1 & 0x400000L) != 0L) - return 401; - if ((active0 & 0x40000000000L) != 0L) + return 402; + if ((active0 & 0x391f00000000000L) != 0L || (active1 & 0xb80000L) != 0L) { - jjmatchedKind = 60; + jjmatchedKind = 88; jjmatchedPos = 4; - return 400; + return 402; } - if ((active0 & 0x391f00000000000L) != 0L || (active1 & 0xb80000L) != 0L) + if ((active0 & 0x40000000000L) != 0L) { - jjmatchedKind = 88; + jjmatchedKind = 60; jjmatchedPos = 4; return 401; } return -1; case 5: if ((active0 & 0x11100000000000L) != 0L || (active1 & 0x100000L) != 0L) - return 401; - if ((active0 & 0x380e00000000000L) != 0L || (active1 & 0xa80000L) != 0L) + return 402; + if ((active0 & 0x40000000000L) != 0L) { - jjmatchedKind = 88; + jjmatchedKind = 60; jjmatchedPos = 5; return 401; } - if ((active0 & 0x40000000000L) != 0L) + if ((active0 & 0x380e00000000000L) != 0L || (active1 & 0xa80000L) != 0L) { - jjmatchedKind = 60; + jjmatchedKind = 88; jjmatchedPos = 5; - return 400; + return 402; } return -1; case 6: if ((active0 & 0x80800000000000L) != 0L || (active1 & 0x80000L) != 0L) - return 401; + return 402; if ((active0 & 0x300600000000000L) != 0L || (active1 & 0xa00000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 6; - return 401; + return 402; } if ((active0 & 0x40000000000L) != 0L) - return 400; + return 401; return -1; case 7: if ((active0 & 0x200000000000L) != 0L || (active1 & 0x200000L) != 0L) - return 401; + return 402; if ((active0 & 0x300400000000000L) != 0L || (active1 & 0x800000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 7; - return 401; + return 402; } return -1; case 8: if ((active0 & 0x200400000000000L) != 0L) - return 401; + return 402; if ((active0 & 0x100000000000000L) != 0L || (active1 & 0x800000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 8; - return 401; + return 402; } return -1; case 9: if ((active1 & 0x800000L) != 0L) - return 401; + return 402; if ((active0 & 0x100000000000000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 9; - return 401; + return 402; } return -1; case 10: @@ -182,7 +182,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) { jjmatchedKind = 88; jjmatchedPos = 10; - return 401; + return 402; } return -1; case 11: @@ -190,7 +190,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) { jjmatchedKind = 88; jjmatchedPos = 11; - return 401; + return 402; } return -1; case 12: @@ -198,7 +198,7 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) { jjmatchedKind = 88; jjmatchedPos = 12; - return 401; + return 402; } return -1; default : @@ -235,7 +235,7 @@ private int jjMoveStringLiteralDfa0_0() jjmatchedKind = 18; return jjMoveStringLiteralDfa1_0(0x800L, 0x0L); case 46: - return jjStartNfaWithStates_0(0, 27, 399); + return jjStartNfaWithStates_0(0, 27, 400); case 47: jjmatchedKind = 22; return jjMoveStringLiteralDfa1_0(0x44L, 0x0L); @@ -324,12 +324,12 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) case 78: case 110: if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_0(1, 43, 400); + return jjStartNfaWithStates_0(1, 43, 401); break; case 79: case 111: if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_0(1, 41, 400); + return jjStartNfaWithStates_0(1, 41, 401); break; case 80: case 112: @@ -374,7 +374,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a case 70: case 102: if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(2, 53, 401); + return jjStartNfaWithStates_0(2, 53, 402); break; case 72: case 104: @@ -453,7 +453,7 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a case 82: case 114: if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 50, 401); + return jjStartNfaWithStates_0(3, 50, 402); return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0L); case 83: case 115: @@ -486,14 +486,14 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a case 69: case 101: if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 54, 401); + return jjStartNfaWithStates_0(4, 54, 402); else if ((active1 & 0x400000L) != 0L) - return jjStartNfaWithStates_0(4, 86, 401); + return jjStartNfaWithStates_0(4, 86, 402); return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0L); case 72: case 104: if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 51, 401); + return jjStartNfaWithStates_0(4, 51, 402); break; case 73: case 105: @@ -504,7 +504,7 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a case 78: case 110: if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 49, 401); + return jjStartNfaWithStates_0(4, 49, 402); break; case 79: case 111: @@ -545,22 +545,22 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a case 65: case 97: if ((active1 & 0x100000L) != 0L) - return jjStartNfaWithStates_0(5, 84, 401); + return jjStartNfaWithStates_0(5, 84, 402); break; case 69: case 101: if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 52, 401); + return jjStartNfaWithStates_0(5, 52, 402); break; case 71: case 103: if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 48, 401); + return jjStartNfaWithStates_0(5, 48, 402); return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L, active1, 0L); case 78: case 110: if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_0(5, 44, 401); + return jjStartNfaWithStates_0(5, 44, 402); return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0L); case 79: case 111: @@ -596,7 +596,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a case 68: case 100: if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 55, 401); + return jjStartNfaWithStates_0(6, 55, 402); return jjMoveStringLiteralDfa7_0(active0, 0x100200000000000L, active1, 0L); case 69: case 101: @@ -607,7 +607,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a case 72: case 104: if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_0(6, 42, 400); + return jjStartNfaWithStates_0(6, 42, 401); break; case 73: case 105: @@ -615,7 +615,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a case 78: case 110: if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_0(6, 47, 401); + return jjStartNfaWithStates_0(6, 47, 402); break; case 82: case 114: @@ -623,7 +623,7 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a case 84: case 116: if ((active1 & 0x80000L) != 0L) - return jjStartNfaWithStates_0(6, 83, 401); + return jjStartNfaWithStates_0(6, 83, 402); break; default : break; @@ -647,7 +647,7 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a case 69: case 101: if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_0(7, 45, 401); + return jjStartNfaWithStates_0(7, 45, 402); break; case 79: case 111: @@ -655,7 +655,7 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a case 84: case 116: if ((active1 & 0x200000L) != 0L) - return jjStartNfaWithStates_0(7, 85, 401); + return jjStartNfaWithStates_0(7, 85, 402); return jjMoveStringLiteralDfa8_0(active0, 0x200000000000000L, active1, 0L); default : break; @@ -679,12 +679,12 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a case 78: case 110: if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_0(8, 46, 401); + return jjStartNfaWithStates_0(8, 46, 402); break; case 83: case 115: if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_0(8, 57, 401); + return jjStartNfaWithStates_0(8, 57, 402); break; default : break; @@ -705,7 +705,7 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a case 69: case 101: if ((active1 & 0x800000L) != 0L) - return jjStartNfaWithStates_0(9, 87, 401); + return jjStartNfaWithStates_0(9, 87, 402); break; case 85: case 117: @@ -786,7 +786,7 @@ private int jjMoveStringLiteralDfa13_0(long old0, long active0) case 84: case 116: if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_0(13, 56, 401); + return jjStartNfaWithStates_0(13, 56, 402); break; default : break; @@ -807,7 +807,7 @@ static final long[] jjbitVec0 = { private int jjMoveNfa_0(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 399; + jjnewStateCnt = 400; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -823,72 +823,74 @@ private int jjMoveNfa_0(int startState, int curPos) switch(jjstateSet[--i]) { case 400: - if ((0x3ff200000000000L & l) != 0L) - jjCheckNAddStates(0, 2); - else if (curChar == 40) - { - if (kind > 100) - kind = 100; - } - if ((0x3ff200000000000L & l) != 0L) - { - if (kind > 60) - kind = 60; - jjCheckNAddTwoStates(117, 118); - } - break; - case 96: - if (curChar == 45) - jjstateSet[jjnewStateCnt++] = 97; - break; - case 401: - case 98: - if ((0x3ff200000000000L & l) == 0L) - break; - if (kind > 88) - kind = 88; - jjCheckNAddTwoStates(98, 99); - break; - case 399: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(3, 7); + jjCheckNAddStates(0, 4); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(210, 213); + jjCheckNAddTwoStates(211, 214); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(207, 209); + jjCheckNAddTwoStates(208, 210); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(205, 206); + jjCheckNAddTwoStates(206, 207); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(202, 204); + jjCheckNAddTwoStates(203, 205); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(197, 201); + jjCheckNAddTwoStates(198, 202); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(193, 196); + jjCheckNAddTwoStates(194, 197); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(189, 192); + jjCheckNAddTwoStates(190, 193); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(186, 188); + jjCheckNAddTwoStates(187, 189); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(183, 185); + jjCheckNAddTwoStates(184, 186); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(180, 182); + jjCheckNAddTwoStates(181, 183); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(177, 179); + jjCheckNAddTwoStates(178, 180); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(174, 176); + jjCheckNAddTwoStates(175, 177); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(171, 173); + jjCheckNAddTwoStates(172, 174); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(168, 170); + jjCheckNAddTwoStates(169, 171); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(165, 167); + jjCheckNAddTwoStates(166, 168); if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(163, 164); + jjCheckNAddTwoStates(164, 165); if ((0x3ff000000000000L & l) != 0L) { if (kind > 61) kind = 61; - jjCheckNAdd(162); + jjCheckNAdd(163); + } + break; + case 96: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 97; + break; + case 402: + case 98: + if ((0x3ff200000000000L & l) == 0L) + break; + if (kind > 88) + kind = 88; + jjCheckNAddTwoStates(98, 99); + break; + case 401: + if ((0x3ff200000000000L & l) != 0L) + jjCheckNAddStates(5, 8); + else if ((0x100003600L & l) != 0L) + jjCheckNAddTwoStates(128, 129); + else if (curChar == 40) + { + if (kind > 100) + kind = 100; + } + if ((0x3ff200000000000L & l) != 0L) + { + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); } break; case 4: @@ -896,7 +898,7 @@ private int jjMoveNfa_0(int startState, int curPos) { if (kind > 61) kind = 61; - jjCheckNAddStates(8, 81); + jjCheckNAddStates(9, 82); } else if ((0x100003600L & l) != 0L) { @@ -905,19 +907,19 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(0); } else if (curChar == 46) - jjCheckNAddStates(82, 99); + jjCheckNAddStates(83, 100); else if (curChar == 45) - jjAddStates(100, 101); + jjAddStates(101, 102); else if (curChar == 33) - jjCheckNAddStates(102, 105); + jjCheckNAddStates(103, 106); else if (curChar == 35) jjCheckNAddTwoStates(85, 86); else if (curChar == 36) - jjCheckNAddStates(106, 109); + jjCheckNAddStates(107, 110); else if (curChar == 39) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); else if (curChar == 34) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); else if (curChar == 47) jjstateSet[jjnewStateCnt++] = 3; if (curChar == 35) @@ -944,7 +946,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 6: if (curChar == 36) - jjCheckNAddStates(118, 121); + jjCheckNAddStates(119, 122); break; case 7: if (curChar == 45) @@ -952,63 +954,63 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 9: if ((0x3ff200000000000L & l) != 0L) - jjCheckNAddStates(122, 124); + jjCheckNAddStates(123, 125); break; case 12: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(122, 124); + jjCheckNAddStates(123, 125); break; case 13: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(125, 129); + jjCheckNAddStates(126, 130); break; case 14: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(122, 124); + jjCheckNAddStates(123, 125); break; case 15: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(130, 137); + jjCheckNAddStates(131, 138); break; case 16: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(138, 141); + jjCheckNAddStates(139, 142); break; case 17: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(142, 146); + jjCheckNAddStates(143, 147); break; case 18: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(147, 152); + jjCheckNAddStates(148, 153); break; case 19: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(153, 159); + jjCheckNAddStates(154, 160); break; case 22: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(160, 164); + jjCheckNAddStates(161, 165); break; case 23: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(165, 172); + jjCheckNAddStates(166, 173); break; case 24: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(173, 176); + jjCheckNAddStates(174, 177); break; case 25: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(177, 181); + jjCheckNAddStates(178, 182); break; case 26: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(182, 187); + jjCheckNAddStates(183, 188); break; case 27: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(188, 194); + jjCheckNAddStates(189, 195); break; case 28: if (curChar == 35) @@ -1016,11 +1018,11 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 29: if (curChar == 34) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 30: if ((0xfffffffb00000200L & l) != 0L) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 31: if (curChar == 34 && kind > 59) @@ -1028,47 +1030,47 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 33: if (curChar == 12) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 35: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 36: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(195, 200); + jjCheckNAddStates(196, 201); break; case 37: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 38: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(201, 209); + jjCheckNAddStates(202, 210); break; case 39: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(210, 214); + jjCheckNAddStates(211, 215); break; case 40: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(215, 220); + jjCheckNAddStates(216, 221); break; case 41: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(221, 227); + jjCheckNAddStates(222, 228); break; case 42: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(228, 235); + jjCheckNAddStates(229, 236); break; case 43: if (curChar == 13) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 44: if (curChar == 10) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 45: if (curChar == 13) @@ -1076,11 +1078,11 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 46: if (curChar == 39) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 47: if ((0xffffff7f00000200L & l) != 0L) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 48: if (curChar == 39 && kind > 59) @@ -1088,47 +1090,47 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 50: if (curChar == 12) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 52: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 53: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(236, 241); + jjCheckNAddStates(237, 242); break; case 54: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 55: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(242, 250); + jjCheckNAddStates(243, 251); break; case 56: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(251, 255); + jjCheckNAddStates(252, 256); break; case 57: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(256, 261); + jjCheckNAddStates(257, 262); break; case 58: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(262, 268); + jjCheckNAddStates(263, 269); break; case 59: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(269, 276); + jjCheckNAddStates(270, 277); break; case 60: if (curChar == 13) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 61: if (curChar == 10) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 62: if (curChar == 13) @@ -1136,7 +1138,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 63: if (curChar == 36) - jjCheckNAddStates(106, 109); + jjCheckNAddStates(107, 110); break; case 64: if (curChar == 45) @@ -1161,7 +1163,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 64) kind = 64; - jjCheckNAddStates(277, 280); + jjCheckNAddStates(278, 281); break; case 70: if ((0x100003600L & l) == 0L) @@ -1175,77 +1177,77 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 64) kind = 64; - jjCheckNAddStates(281, 287); + jjCheckNAddStates(282, 288); break; case 72: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(288, 290); + jjCheckNAddStates(289, 291); break; case 73: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(291, 294); + jjCheckNAddStates(292, 295); break; case 74: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(295, 299); + jjCheckNAddStates(296, 300); break; case 75: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(300, 305); + jjCheckNAddStates(301, 306); break; case 78: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(306, 309); + jjCheckNAddStates(307, 310); break; case 79: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(310, 316); + jjCheckNAddStates(311, 317); break; case 80: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(317, 319); + jjCheckNAddStates(318, 320); break; case 81: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(320, 323); + jjCheckNAddStates(321, 324); break; case 82: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(324, 328); + jjCheckNAddStates(325, 329); break; case 83: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(329, 334); + jjCheckNAddStates(330, 335); break; case 84: if (curChar == 35) @@ -1270,7 +1272,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 82) kind = 82; - jjCheckNAddStates(335, 338); + jjCheckNAddStates(336, 339); break; case 89: if ((0x100003600L & l) == 0L) @@ -1284,35 +1286,35 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 82) kind = 82; - jjCheckNAddStates(339, 345); + jjCheckNAddStates(340, 346); break; case 91: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(346, 348); + jjCheckNAddStates(347, 349); break; case 92: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(349, 352); + jjCheckNAddStates(350, 353); break; case 93: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(353, 357); + jjCheckNAddStates(354, 358); break; case 94: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(358, 363); + jjCheckNAddStates(359, 364); break; case 100: if ((0xffffffff00000000L & l) == 0L) @@ -1326,7 +1328,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 88) kind = 88; - jjCheckNAddStates(364, 367); + jjCheckNAddStates(365, 368); break; case 102: if ((0x100003600L & l) == 0L) @@ -1340,77 +1342,77 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 88) kind = 88; - jjCheckNAddStates(368, 374); + jjCheckNAddStates(369, 375); break; case 104: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(375, 377); + jjCheckNAddStates(376, 378); break; case 105: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(378, 381); + jjCheckNAddStates(379, 382); break; case 106: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(382, 386); + jjCheckNAddStates(383, 387); break; case 107: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(387, 392); + jjCheckNAddStates(388, 393); break; case 110: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(393, 396); + jjCheckNAddStates(394, 397); break; case 111: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(397, 403); + jjCheckNAddStates(398, 404); break; case 112: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(404, 406); + jjCheckNAddStates(405, 407); break; case 113: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(407, 410); + jjCheckNAddStates(408, 411); break; case 114: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(411, 415); + jjCheckNAddStates(412, 416); break; case 115: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(416, 421); + jjCheckNAddStates(417, 422); break; case 117: if ((0x3ff200000000000L & l) == 0L) @@ -1431,7 +1433,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 60) kind = 60; - jjCheckNAddStates(422, 425); + jjCheckNAddStates(423, 426); break; case 121: if ((0x100003600L & l) == 0L) @@ -1445,513 +1447,514 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 60) kind = 60; - jjCheckNAddStates(426, 432); + jjCheckNAddStates(427, 433); break; case 123: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(433, 435); + jjCheckNAddStates(434, 436); break; case 124: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(436, 439); + jjCheckNAddStates(437, 440); break; case 125: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(440, 444); + jjCheckNAddStates(441, 445); break; case 126: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(445, 450); + jjCheckNAddStates(446, 451); break; case 127: if ((0x3ff200000000000L & l) != 0L) - jjCheckNAddStates(0, 2); + jjCheckNAddStates(5, 8); break; case 128: + if ((0x100003600L & l) != 0L) + jjCheckNAddTwoStates(128, 129); + break; + case 129: if (curChar == 40 && kind > 100) kind = 100; break; - case 130: - if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(0, 2); - break; case 131: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(451, 455); + if ((0xffffffff00000000L & l) != 0L) + jjCheckNAddStates(5, 8); break; case 132: - if ((0x100003600L & l) != 0L) - jjCheckNAddStates(0, 2); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(452, 456); break; case 133: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(456, 463); + if ((0x100003600L & l) != 0L) + jjCheckNAddStates(5, 8); break; case 134: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(464, 467); + jjCheckNAddStates(457, 464); break; case 135: + case 341: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(468, 472); + jjCheckNAddStates(465, 468); break; case 136: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(473, 478); + jjCheckNAddStates(469, 473); break; case 137: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(479, 485); + jjCheckNAddStates(474, 479); break; case 138: - if (curChar == 33) - jjCheckNAddStates(102, 105); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(480, 486); break; case 139: + if (curChar == 33) + jjCheckNAddStates(103, 106); + break; + case 140: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(139, 146); + jjCheckNAddTwoStates(140, 147); break; - case 147: + case 148: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(147, 156); + jjCheckNAddTwoStates(148, 157); break; - case 157: + case 158: if (curChar == 45) - jjAddStates(100, 101); + jjAddStates(101, 102); break; - case 161: + case 162: if (curChar == 46) - jjCheckNAddStates(82, 99); + jjCheckNAddStates(83, 100); break; - case 162: + case 163: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 61) kind = 61; - jjCheckNAdd(162); + jjCheckNAdd(163); break; - case 163: + case 164: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(163, 164); + jjCheckNAddTwoStates(164, 165); break; - case 164: + case 165: if (curChar == 37 && kind > 65) kind = 65; break; - case 165: + case 166: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(165, 167); + jjCheckNAddTwoStates(166, 168); break; - case 168: + case 169: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(168, 170); + jjCheckNAddTwoStates(169, 171); break; - case 171: + case 172: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(171, 173); + jjCheckNAddTwoStates(172, 174); break; - case 174: + case 175: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(174, 176); + jjCheckNAddTwoStates(175, 177); break; - case 177: + case 178: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(177, 179); + jjCheckNAddTwoStates(178, 180); break; - case 180: + case 181: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(180, 182); + jjCheckNAddTwoStates(181, 183); break; - case 183: + case 184: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(183, 185); + jjCheckNAddTwoStates(184, 186); break; - case 186: + case 187: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(186, 188); + jjCheckNAddTwoStates(187, 189); break; - case 189: + case 190: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(189, 192); + jjCheckNAddTwoStates(190, 193); break; - case 193: + case 194: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(193, 196); + jjCheckNAddTwoStates(194, 197); break; - case 197: + case 198: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(197, 201); + jjCheckNAddTwoStates(198, 202); break; - case 202: + case 203: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(202, 204); + jjCheckNAddTwoStates(203, 205); break; - case 205: + case 206: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(205, 206); + jjCheckNAddTwoStates(206, 207); break; - case 207: + case 208: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(207, 209); + jjCheckNAddTwoStates(208, 210); break; - case 210: + case 211: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(210, 213); + jjCheckNAddTwoStates(211, 214); break; - case 214: + case 215: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(3, 7); + jjCheckNAddStates(0, 4); break; - case 215: + case 216: if (curChar == 45) - jjCheckNAdd(216); + jjCheckNAdd(217); break; - case 217: + case 218: if ((0x3ff200000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddTwoStates(217, 218); - break; - case 219: - if ((0xffffffff00000000L & l) == 0L) - break; - if (kind > 81) - kind = 81; - jjCheckNAddTwoStates(217, 218); + jjCheckNAddTwoStates(218, 219); break; case 220: - if ((0x3ff000000000000L & l) == 0L) + if ((0xffffffff00000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(486, 489); + jjCheckNAddTwoStates(218, 219); break; case 221: - if ((0x100003600L & l) == 0L) + if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddTwoStates(217, 218); + jjCheckNAddStates(487, 490); break; case 222: - if ((0x3ff000000000000L & l) == 0L) + if ((0x100003600L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(490, 496); + jjCheckNAddTwoStates(218, 219); break; case 223: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(497, 499); + jjCheckNAddStates(491, 497); break; case 224: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(500, 503); + jjCheckNAddStates(498, 500); break; case 225: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(504, 508); + jjCheckNAddStates(501, 504); break; case 226: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(509, 514); + jjCheckNAddStates(505, 509); break; - case 229: + case 227: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(515, 518); + jjCheckNAddStates(510, 515); break; case 230: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(519, 525); + jjCheckNAddStates(516, 519); break; case 231: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(526, 528); + jjCheckNAddStates(520, 526); break; case 232: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(529, 532); + jjCheckNAddStates(527, 529); break; case 233: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(533, 537); + jjCheckNAddStates(530, 533); break; case 234: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(538, 543); + jjCheckNAddStates(534, 538); break; - case 236: - if (curChar == 40) - jjCheckNAddStates(544, 549); + case 235: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 81) + kind = 81; + jjCheckNAddStates(539, 544); break; case 237: - if ((0xfffffc7a00000000L & l) != 0L) - jjCheckNAddStates(550, 553); + if (curChar == 40) + jjCheckNAddStates(545, 550); break; case 238: - if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(238, 239); + if ((0xfffffc7a00000000L & l) != 0L) + jjCheckNAddStates(551, 554); break; case 239: + if ((0x100003600L & l) != 0L) + jjCheckNAddTwoStates(239, 240); + break; + case 240: if (curChar == 41 && kind > 63) kind = 63; break; - case 241: - if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(550, 553); - break; case 242: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(554, 558); + if ((0xffffffff00000000L & l) != 0L) + jjCheckNAddStates(551, 554); break; case 243: - if ((0x100003600L & l) != 0L) - jjCheckNAddStates(550, 553); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(555, 559); break; case 244: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(559, 566); + if ((0x100003600L & l) != 0L) + jjCheckNAddStates(551, 554); break; case 245: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(567, 570); + jjCheckNAddStates(560, 567); break; case 246: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(571, 575); + jjCheckNAddStates(568, 571); break; case 247: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(576, 581); + jjCheckNAddStates(572, 576); break; case 248: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(582, 588); + jjCheckNAddStates(577, 582); break; case 249: - if (curChar == 39) - jjCheckNAddStates(589, 592); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(583, 589); break; case 250: - if ((0xffffff7f00000200L & l) != 0L) - jjCheckNAddStates(589, 592); + if (curChar == 39) + jjCheckNAddStates(590, 593); break; case 251: + if ((0xffffff7f00000200L & l) != 0L) + jjCheckNAddStates(590, 593); + break; + case 252: if (curChar == 39) - jjCheckNAddTwoStates(238, 239); + jjCheckNAddTwoStates(239, 240); break; - case 253: + case 254: if (curChar == 12) - jjCheckNAddStates(589, 592); - break; - case 255: - if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(589, 592); + jjCheckNAddStates(590, 593); break; case 256: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(593, 598); + if ((0xffffffff00000000L & l) != 0L) + jjCheckNAddStates(590, 593); break; case 257: - if ((0x100003600L & l) != 0L) - jjCheckNAddStates(589, 592); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(594, 599); break; case 258: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(599, 607); + if ((0x100003600L & l) != 0L) + jjCheckNAddStates(590, 593); break; case 259: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(608, 612); + jjCheckNAddStates(600, 608); break; case 260: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(613, 618); + jjCheckNAddStates(609, 613); break; case 261: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(619, 625); + jjCheckNAddStates(614, 619); break; case 262: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(626, 633); + jjCheckNAddStates(620, 626); break; case 263: - if (curChar == 13) - jjCheckNAddStates(589, 592); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(627, 634); break; case 264: - if (curChar == 10) - jjCheckNAddStates(589, 592); + if (curChar == 13) + jjCheckNAddStates(590, 593); break; case 265: - if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 264; + if (curChar == 10) + jjCheckNAddStates(590, 593); break; case 266: - if (curChar == 34) - jjCheckNAddStates(634, 637); + if (curChar == 13) + jjstateSet[jjnewStateCnt++] = 265; break; case 267: - if ((0xfffffffb00000200L & l) != 0L) - jjCheckNAddStates(634, 637); + if (curChar == 34) + jjCheckNAddStates(635, 638); break; case 268: + if ((0xfffffffb00000200L & l) != 0L) + jjCheckNAddStates(635, 638); + break; + case 269: if (curChar == 34) - jjCheckNAddTwoStates(238, 239); + jjCheckNAddTwoStates(239, 240); break; - case 270: + case 271: if (curChar == 12) - jjCheckNAddStates(634, 637); - break; - case 272: - if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(634, 637); + jjCheckNAddStates(635, 638); break; case 273: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(638, 643); + if ((0xffffffff00000000L & l) != 0L) + jjCheckNAddStates(635, 638); break; case 274: - if ((0x100003600L & l) != 0L) - jjCheckNAddStates(634, 637); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(639, 644); break; case 275: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(644, 652); + if ((0x100003600L & l) != 0L) + jjCheckNAddStates(635, 638); break; case 276: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(653, 657); + jjCheckNAddStates(645, 653); break; case 277: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(658, 663); + jjCheckNAddStates(654, 658); break; case 278: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(664, 670); + jjCheckNAddStates(659, 664); break; case 279: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(671, 678); + jjCheckNAddStates(665, 671); break; case 280: - if (curChar == 13) - jjCheckNAddStates(634, 637); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(672, 679); break; case 281: - if (curChar == 10) - jjCheckNAddStates(634, 637); - break; - case 282: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 281; + jjCheckNAddStates(635, 638); + break; + case 282: + if (curChar == 10) + jjCheckNAddStates(635, 638); break; case 283: + if (curChar == 13) + jjstateSet[jjnewStateCnt++] = 282; + break; + case 284: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(679, 685); + jjCheckNAddStates(680, 686); break; - case 286: + case 287: if (curChar == 43) - jjAddStates(686, 687); + jjAddStates(687, 688); break; - case 287: + case 288: if (curChar != 63) break; if (kind > 99) kind = 99; - jjstateSet[jjnewStateCnt++] = 288; + jjstateSet[jjnewStateCnt++] = 289; break; - case 288: + case 289: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddStates(688, 691); + jjCheckNAddStates(689, 692); break; - case 289: + case 290: if (curChar == 63 && kind > 99) kind = 99; break; - case 290: - case 305: - case 309: - case 312: - case 315: + case 291: + case 306: + case 310: + case 313: + case 316: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAdd(289); + jjCheckNAdd(290); break; - case 291: + case 292: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddTwoStates(289, 290); + jjCheckNAddTwoStates(290, 291); break; - case 292: + case 293: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddStates(692, 694); + jjCheckNAddStates(693, 695); break; - case 293: + case 294: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjAddStates(695, 700); - break; - case 294: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 295; + jjAddStates(696, 701); break; case 295: if ((0x3ff000000000000L & l) != 0L) @@ -1959,15 +1962,15 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 296: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAdd(297); + jjstateSet[jjnewStateCnt++] = 297; break; case 297: - if ((0x3ff000000000000L & l) != 0L && kind > 99) - kind = 99; + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAdd(298); break; case 298: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 299; + if ((0x3ff000000000000L & l) != 0L && kind > 99) + kind = 99; break; case 299: if ((0x3ff000000000000L & l) != 0L) @@ -1978,445 +1981,445 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 301; break; case 301: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 302; + break; + case 302: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAdd(289); - break; - case 302: - if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 303; + jjCheckNAdd(290); break; case 303: if ((0x3ff000000000000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 304; break; case 304: + if ((0x3ff000000000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 305; + break; + case 305: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjstateSet[jjnewStateCnt++] = 305; + jjstateSet[jjnewStateCnt++] = 306; break; - case 306: + case 307: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 307; + jjstateSet[jjnewStateCnt++] = 308; break; - case 307: + case 308: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjstateSet[jjnewStateCnt++] = 308; + jjstateSet[jjnewStateCnt++] = 309; break; - case 308: + case 309: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddTwoStates(289, 309); + jjCheckNAddTwoStates(290, 310); break; - case 310: + case 311: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjstateSet[jjnewStateCnt++] = 311; + jjstateSet[jjnewStateCnt++] = 312; break; - case 311: + case 312: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddStates(701, 703); + jjCheckNAddStates(702, 704); break; - case 313: + case 314: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddTwoStates(289, 312); + jjCheckNAddTwoStates(290, 313); break; - case 314: + case 315: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddStates(704, 707); + jjCheckNAddStates(705, 708); break; - case 316: + case 317: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddTwoStates(289, 315); + jjCheckNAddTwoStates(290, 316); break; - case 317: + case 318: if (curChar != 63) break; if (kind > 99) kind = 99; - jjCheckNAddStates(708, 710); - break; - case 318: - if (curChar == 43) - jjstateSet[jjnewStateCnt++] = 319; + jjCheckNAddStates(709, 711); break; case 319: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(320, 326); + if (curChar == 43) + jjstateSet[jjnewStateCnt++] = 320; break; case 320: - if (curChar == 45) - jjstateSet[jjnewStateCnt++] = 321; + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(321, 327); break; case 321: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 99) - kind = 99; - jjstateSet[jjnewStateCnt++] = 322; + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 322; break; case 322: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAddStates(711, 714); + jjstateSet[jjnewStateCnt++] = 323; break; case 323: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAdd(297); + jjCheckNAddStates(712, 715); break; case 324: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAddTwoStates(297, 323); + jjCheckNAdd(298); break; case 325: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAddStates(715, 717); + jjCheckNAddTwoStates(298, 324); break; case 326: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(718, 722); + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 99) + kind = 99; + jjCheckNAddStates(716, 718); break; case 327: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAdd(320); + jjCheckNAddStates(719, 723); break; case 328: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(327, 320); + jjCheckNAdd(321); break; case 329: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(723, 725); + jjCheckNAddTwoStates(328, 321); break; case 330: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(726, 729); + jjCheckNAddStates(724, 726); break; - case 332: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 60) - kind = 60; - jjCheckNAddStates(730, 733); + case 331: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(727, 730); break; case 333: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(734, 740); + jjCheckNAddStates(731, 734); break; case 334: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(741, 743); + jjCheckNAddStates(735, 741); break; case 335: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(744, 747); + jjCheckNAddStates(742, 744); break; case 336: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(748, 752); + jjCheckNAddStates(745, 748); break; case 337: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(753, 758); + jjCheckNAddStates(749, 753); break; case 338: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(759, 763); + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 60) + kind = 60; + jjCheckNAddStates(754, 759); break; case 339: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(764, 771); + jjCheckNAddStates(760, 764); break; case 340: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(772, 775); - break; - case 341: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(776, 780); + jjCheckNAddStates(765, 772); break; case 342: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(781, 786); + jjCheckNAddStates(773, 777); break; case 343: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(787, 793); + jjCheckNAddStates(778, 783); break; case 344: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(784, 790); + break; + case 345: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 61) kind = 61; - jjCheckNAddStates(8, 81); + jjCheckNAddStates(9, 82); break; - case 345: + case 346: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 61) kind = 61; - jjCheckNAdd(345); - break; - case 346: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(346, 347); + jjCheckNAdd(346); break; case 347: - if (curChar == 46) - jjCheckNAdd(162); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(347, 348); break; case 348: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(348, 164); + if (curChar == 46) + jjCheckNAdd(163); break; case 349: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(349, 350); + jjCheckNAddTwoStates(349, 165); break; case 350: - if (curChar == 46) - jjCheckNAdd(163); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(350, 351); break; case 351: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(351, 167); + if (curChar == 46) + jjCheckNAdd(164); break; case 352: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(352, 353); + jjCheckNAddTwoStates(352, 168); break; case 353: - if (curChar == 46) - jjCheckNAdd(165); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(353, 354); break; case 354: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(354, 170); + if (curChar == 46) + jjCheckNAdd(166); break; case 355: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(355, 356); + jjCheckNAddTwoStates(355, 171); break; case 356: - if (curChar == 46) - jjCheckNAdd(168); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(356, 357); break; case 357: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(357, 173); + if (curChar == 46) + jjCheckNAdd(169); break; case 358: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(358, 359); + jjCheckNAddTwoStates(358, 174); break; case 359: - if (curChar == 46) - jjCheckNAdd(171); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(359, 360); break; case 360: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(360, 176); + if (curChar == 46) + jjCheckNAdd(172); break; case 361: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(361, 362); + jjCheckNAddTwoStates(361, 177); break; case 362: - if (curChar == 46) - jjCheckNAdd(174); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(362, 363); break; case 363: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(363, 179); + if (curChar == 46) + jjCheckNAdd(175); break; case 364: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(364, 365); + jjCheckNAddTwoStates(364, 180); break; case 365: - if (curChar == 46) - jjCheckNAdd(177); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(365, 366); break; case 366: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(366, 182); + if (curChar == 46) + jjCheckNAdd(178); break; case 367: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(367, 368); + jjCheckNAddTwoStates(367, 183); break; case 368: - if (curChar == 46) - jjCheckNAdd(180); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(368, 369); break; case 369: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(369, 185); + if (curChar == 46) + jjCheckNAdd(181); break; case 370: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(370, 371); + jjCheckNAddTwoStates(370, 186); break; case 371: - if (curChar == 46) - jjCheckNAdd(183); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(371, 372); break; case 372: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(372, 188); + if (curChar == 46) + jjCheckNAdd(184); break; case 373: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(373, 374); + jjCheckNAddTwoStates(373, 189); break; case 374: - if (curChar == 46) - jjCheckNAdd(186); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(374, 375); break; case 375: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(375, 192); + if (curChar == 46) + jjCheckNAdd(187); break; case 376: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(376, 377); + jjCheckNAddTwoStates(376, 193); break; case 377: - if (curChar == 46) - jjCheckNAdd(189); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(377, 378); break; case 378: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(378, 196); + if (curChar == 46) + jjCheckNAdd(190); break; case 379: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(379, 380); + jjCheckNAddTwoStates(379, 197); break; case 380: - if (curChar == 46) - jjCheckNAdd(193); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(380, 381); break; case 381: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(381, 201); + if (curChar == 46) + jjCheckNAdd(194); break; case 382: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(382, 383); + jjCheckNAddTwoStates(382, 202); break; case 383: - if (curChar == 46) - jjCheckNAdd(197); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(383, 384); break; case 384: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(384, 204); + if (curChar == 46) + jjCheckNAdd(198); break; case 385: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(385, 386); + jjCheckNAddTwoStates(385, 205); break; case 386: - if (curChar == 46) - jjCheckNAdd(202); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(386, 387); break; case 387: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(387, 206); + if (curChar == 46) + jjCheckNAdd(203); break; case 388: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(388, 389); + jjCheckNAddTwoStates(388, 207); break; case 389: - if (curChar == 46) - jjCheckNAdd(205); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(389, 390); break; case 390: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(390, 209); + if (curChar == 46) + jjCheckNAdd(206); break; case 391: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(391, 392); + jjCheckNAddTwoStates(391, 210); break; case 392: - if (curChar == 46) - jjCheckNAdd(207); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(392, 393); break; case 393: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(393, 213); + if (curChar == 46) + jjCheckNAdd(208); break; case 394: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(394, 395); + jjCheckNAddTwoStates(394, 214); break; case 395: - if (curChar == 46) - jjCheckNAdd(210); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(395, 396); break; case 396: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(794, 798); + if (curChar == 46) + jjCheckNAdd(211); break; case 397: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(397, 398); + jjCheckNAddStates(791, 795); break; case 398: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(398, 399); + break; + case 399: if (curChar == 46) - jjCheckNAdd(214); + jjCheckNAdd(215); break; default : break; } @@ -2429,20 +2432,6 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 400: - if ((0x7fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(0, 2); - else if (curChar == 92) - jjCheckNAddTwoStates(119, 120); - if ((0x7fffffe87fffffeL & l) != 0L) - { - if (kind > 60) - kind = 60; - jjCheckNAddTwoStates(117, 118); - } - else if (curChar == 92) - jjCheckNAddTwoStates(130, 131); - break; case 96: if ((0x7fffffe07fffffeL & l) != 0L) { @@ -2453,9 +2442,9 @@ private int jjMoveNfa_0(int startState, int curPos) else if (curChar == 92) jjCheckNAddTwoStates(100, 110); break; - case 158: + case 159: if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(0, 2); + jjCheckNAddStates(5, 8); if ((0x7fffffe07fffffeL & l) != 0L) { if (kind > 60) @@ -2463,7 +2452,7 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(117, 118); } break; - case 401: + case 402: if ((0x7fffffe87fffffeL & l) != 0L) { if (kind > 88) @@ -2473,19 +2462,33 @@ private int jjMoveNfa_0(int startState, int curPos) else if (curChar == 92) jjCheckNAddTwoStates(100, 101); break; + case 401: + if ((0x7fffffe87fffffeL & l) != 0L) + jjCheckNAddStates(5, 8); + else if (curChar == 92) + jjCheckNAddTwoStates(119, 120); + if ((0x7fffffe87fffffeL & l) != 0L) + { + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); + } + else if (curChar == 92) + jjCheckNAddTwoStates(131, 132); + break; case 4: if ((0x7fffffe07fffffeL & l) != 0L) { if (kind > 60) kind = 60; - jjCheckNAddStates(799, 803); + jjCheckNAddStates(796, 801); } else if (curChar == 92) - jjCheckNAddStates(804, 807); + jjCheckNAddStates(802, 805); else if (curChar == 64) - jjAddStates(808, 811); + jjAddStates(806, 809); if ((0x20000000200000L & l) != 0L) - jjAddStates(812, 814); + jjAddStates(810, 812); break; case 2: if (kind > 5) @@ -2497,11 +2500,11 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 8: if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(122, 124); + jjCheckNAddStates(123, 125); break; case 9: if ((0x7fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(122, 124); + jjCheckNAddStates(123, 125); break; case 10: if (curChar == 125 && kind > 31) @@ -2513,31 +2516,31 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 12: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(122, 124); + jjCheckNAddStates(123, 125); break; case 13: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(125, 129); + jjCheckNAddStates(126, 130); break; case 15: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(130, 137); + jjCheckNAddStates(131, 138); break; case 16: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(138, 141); + jjCheckNAddStates(139, 142); break; case 17: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(142, 146); + jjCheckNAddStates(143, 147); break; case 18: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(147, 152); + jjCheckNAddStates(148, 153); break; case 19: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(153, 159); + jjCheckNAddStates(154, 160); break; case 21: if (curChar == 92) @@ -2545,101 +2548,101 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 22: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(160, 164); + jjCheckNAddStates(161, 165); break; case 23: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(165, 172); + jjCheckNAddStates(166, 173); break; case 24: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(173, 176); + jjCheckNAddStates(174, 177); break; case 25: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(177, 181); + jjCheckNAddStates(178, 182); break; case 26: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(182, 187); + jjCheckNAddStates(183, 188); break; case 27: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(188, 194); + jjCheckNAddStates(189, 195); break; case 30: case 35: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 32: if (curChar == 92) - jjAddStates(815, 818); + jjAddStates(813, 816); break; case 34: if (curChar == 92) - jjAddStates(819, 820); + jjAddStates(817, 818); break; case 36: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(195, 200); + jjCheckNAddStates(196, 201); break; case 38: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(201, 209); + jjCheckNAddStates(202, 210); break; case 39: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(210, 214); + jjCheckNAddStates(211, 215); break; case 40: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(215, 220); + jjCheckNAddStates(216, 221); break; case 41: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(221, 227); + jjCheckNAddStates(222, 228); break; case 42: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(228, 235); + jjCheckNAddStates(229, 236); break; case 47: case 52: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 49: if (curChar == 92) - jjAddStates(821, 824); + jjAddStates(819, 822); break; case 51: if (curChar == 92) - jjAddStates(825, 826); + jjAddStates(823, 824); break; case 53: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(236, 241); + jjCheckNAddStates(237, 242); break; case 55: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(242, 250); + jjCheckNAddStates(243, 251); break; case 56: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(251, 255); + jjCheckNAddStates(252, 256); break; case 57: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(256, 261); + jjCheckNAddStates(257, 262); break; case 58: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(262, 268); + jjCheckNAddStates(263, 269); break; case 59: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(269, 276); + jjCheckNAddStates(270, 277); break; case 65: if ((0x7fffffe07fffffeL & l) == 0L) @@ -2671,42 +2674,42 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 64) kind = 64; - jjCheckNAddStates(277, 280); + jjCheckNAddStates(278, 281); break; case 71: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(281, 287); + jjCheckNAddStates(282, 288); break; case 72: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(288, 290); + jjCheckNAddStates(289, 291); break; case 73: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(291, 294); + jjCheckNAddStates(292, 295); break; case 74: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(295, 299); + jjCheckNAddStates(296, 300); break; case 75: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(300, 305); + jjCheckNAddStates(301, 306); break; case 77: if (curChar == 92) @@ -2717,42 +2720,42 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 64) kind = 64; - jjCheckNAddStates(306, 309); + jjCheckNAddStates(307, 310); break; case 79: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(310, 316); + jjCheckNAddStates(311, 317); break; case 80: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(317, 319); + jjCheckNAddStates(318, 320); break; case 81: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(320, 323); + jjCheckNAddStates(321, 324); break; case 82: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(324, 328); + jjCheckNAddStates(325, 329); break; case 83: if ((0x7e0000007eL & l) == 0L) break; if (kind > 64) kind = 64; - jjCheckNAddStates(329, 334); + jjCheckNAddStates(330, 335); break; case 85: if ((0x7fffffe87fffffeL & l) == 0L) @@ -2763,7 +2766,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 86: if (curChar == 92) - jjAddStates(827, 828); + jjAddStates(825, 826); break; case 87: if ((0x7fffffffffffffffL & l) == 0L) @@ -2777,46 +2780,46 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 82) kind = 82; - jjCheckNAddStates(335, 338); + jjCheckNAddStates(336, 339); break; case 90: if ((0x7e0000007eL & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(339, 345); + jjCheckNAddStates(340, 346); break; case 91: if ((0x7e0000007eL & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(346, 348); + jjCheckNAddStates(347, 349); break; case 92: if ((0x7e0000007eL & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(349, 352); + jjCheckNAddStates(350, 353); break; case 93: if ((0x7e0000007eL & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(353, 357); + jjCheckNAddStates(354, 358); break; case 94: if ((0x7e0000007eL & l) == 0L) break; if (kind > 82) kind = 82; - jjCheckNAddStates(358, 363); + jjCheckNAddStates(359, 364); break; case 95: if (curChar == 64) - jjAddStates(808, 811); + jjAddStates(806, 809); break; case 97: if ((0x7fffffe07fffffeL & l) == 0L) @@ -2848,42 +2851,42 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 88) kind = 88; - jjCheckNAddStates(364, 367); + jjCheckNAddStates(365, 368); break; case 103: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(368, 374); + jjCheckNAddStates(369, 375); break; case 104: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(375, 377); + jjCheckNAddStates(376, 378); break; case 105: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(378, 381); + jjCheckNAddStates(379, 382); break; case 106: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(382, 386); + jjCheckNAddStates(383, 387); break; case 107: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(387, 392); + jjCheckNAddStates(388, 393); break; case 109: if (curChar == 92) @@ -2894,42 +2897,42 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 88) kind = 88; - jjCheckNAddStates(393, 396); + jjCheckNAddStates(394, 397); break; case 111: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(397, 403); + jjCheckNAddStates(398, 404); break; case 112: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(404, 406); + jjCheckNAddStates(405, 407); break; case 113: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(407, 410); + jjCheckNAddStates(408, 411); break; case 114: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(411, 415); + jjCheckNAddStates(412, 416); break; case 115: if ((0x7e0000007eL & l) == 0L) break; if (kind > 88) kind = 88; - jjCheckNAddStates(416, 421); + jjCheckNAddStates(417, 422); break; case 117: if ((0x7fffffe87fffffeL & l) == 0L) @@ -2954,532 +2957,529 @@ private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 60) kind = 60; - jjCheckNAddStates(422, 425); + jjCheckNAddStates(423, 426); break; case 122: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(426, 432); + jjCheckNAddStates(427, 433); break; case 123: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(433, 435); + jjCheckNAddStates(434, 436); break; case 124: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(436, 439); + jjCheckNAddStates(437, 440); break; case 125: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(440, 444); + jjCheckNAddStates(441, 445); break; case 126: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(445, 450); + jjCheckNAddStates(446, 451); break; case 127: if ((0x7fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(0, 2); - break; - case 129: - if (curChar == 92) - jjCheckNAddTwoStates(130, 131); + jjCheckNAddStates(5, 8); break; case 130: - if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(0, 2); + if (curChar == 92) + jjCheckNAddTwoStates(131, 132); break; case 131: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(451, 455); + if ((0x7fffffffffffffffL & l) != 0L) + jjCheckNAddStates(5, 8); break; - case 133: + case 132: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(456, 463); + jjCheckNAddStates(452, 456); break; case 134: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(464, 467); + jjCheckNAddStates(457, 464); break; case 135: + case 341: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(468, 472); + jjCheckNAddStates(465, 468); break; case 136: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(473, 478); + jjCheckNAddStates(469, 473); break; case 137: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(479, 485); + jjCheckNAddStates(474, 479); break; - case 140: - if ((0x10000000100000L & l) != 0L && kind > 58) - kind = 58; + case 138: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(480, 486); break; case 141: - if ((0x100000001000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 140; + if ((0x10000000100000L & l) != 0L && kind > 58) + kind = 58; break; case 142: - if ((0x20000000200000L & l) != 0L) + if ((0x100000001000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 141; break; case 143: - if ((0x200000002L & l) != 0L) + if ((0x20000000200000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 142; break; case 144: - if ((0x4000000040L & l) != 0L) + if ((0x200000002L & l) != 0L) jjstateSet[jjnewStateCnt++] = 143; break; case 145: - if ((0x2000000020L & l) != 0L) + if ((0x4000000040L & l) != 0L) jjstateSet[jjnewStateCnt++] = 144; break; case 146: - if ((0x1000000010L & l) != 0L) + if ((0x2000000020L & l) != 0L) jjstateSet[jjnewStateCnt++] = 145; break; - case 148: - if ((0x10000000100000L & l) != 0L && kind > 89) - kind = 89; + case 147: + if ((0x1000000010L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 146; break; case 149: - if ((0x400000004000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 148; + if ((0x10000000100000L & l) != 0L && kind > 89) + kind = 89; break; case 150: - if ((0x200000002L & l) != 0L) + if ((0x400000004000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 149; break; case 151: - if ((0x10000000100000L & l) != 0L) + if ((0x200000002L & l) != 0L) jjstateSet[jjnewStateCnt++] = 150; break; case 152: - if ((0x4000000040000L & l) != 0L) + if ((0x10000000100000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 151; break; case 153: - if ((0x800000008000L & l) != 0L) + if ((0x4000000040000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 152; break; case 154: - if ((0x1000000010000L & l) != 0L) + if ((0x800000008000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 153; break; case 155: - if ((0x200000002000L & l) != 0L) + if ((0x1000000010000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 154; break; case 156: - if ((0x20000000200L & l) != 0L) + if ((0x200000002000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 155; break; - case 159: - if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(0, 2); + case 157: + if ((0x20000000200L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 156; break; case 160: + if ((0x7fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(5, 8); + break; + case 161: if ((0x7fffffe07fffffeL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(799, 803); + jjCheckNAddStates(796, 801); break; - case 166: + case 167: if ((0x10000000100000L & l) != 0L && kind > 66) kind = 66; break; - case 167: + case 168: if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 166; + jjstateSet[jjnewStateCnt++] = 167; break; - case 169: + case 170: if ((0x200000002000L & l) != 0L && kind > 67) kind = 67; break; - case 170: + case 171: if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 169; + jjstateSet[jjnewStateCnt++] = 170; break; - case 172: + case 173: if ((0x200000002000L & l) != 0L && kind > 68) kind = 68; break; - case 173: + case 174: if ((0x800000008L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 172; + jjstateSet[jjnewStateCnt++] = 173; break; - case 175: + case 176: if ((0x800000008L & l) != 0L && kind > 69) kind = 69; break; - case 176: + case 177: if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 175; + jjstateSet[jjnewStateCnt++] = 176; break; - case 178: + case 179: if ((0x400000004000L & l) != 0L && kind > 70) kind = 70; break; - case 179: + case 180: if ((0x20000000200L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 178; + jjstateSet[jjnewStateCnt++] = 179; break; - case 181: + case 182: if ((0x100000001000000L & l) != 0L && kind > 71) kind = 71; break; - case 182: + case 183: if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 181; + jjstateSet[jjnewStateCnt++] = 182; break; - case 184: + case 185: if ((0x200000002000L & l) != 0L && kind > 72) kind = 72; break; - case 185: + case 186: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 184; + jjstateSet[jjnewStateCnt++] = 185; break; - case 187: + case 188: if ((0x100000001000000L & l) != 0L && kind > 73) kind = 73; break; - case 188: + case 189: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 187; + jjstateSet[jjnewStateCnt++] = 188; break; - case 190: + case 191: if ((0x8000000080L & l) != 0L && kind > 74) kind = 74; break; - case 191: + case 192: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 190; + jjstateSet[jjnewStateCnt++] = 191; break; - case 192: + case 193: if ((0x1000000010L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 191; + jjstateSet[jjnewStateCnt++] = 192; break; - case 194: + case 195: if ((0x1000000010L & l) != 0L && kind > 75) kind = 75; break; - case 195: + case 196: if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 194; + jjstateSet[jjnewStateCnt++] = 195; break; - case 196: + case 197: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 195; + jjstateSet[jjnewStateCnt++] = 196; break; - case 198: + case 199: if ((0x1000000010L & l) != 0L && kind > 76) kind = 76; break; - case 199: - if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 198; - break; case 200: - if ((0x4000000040000L & l) != 0L) + if ((0x200000002L & l) != 0L) jjstateSet[jjnewStateCnt++] = 199; break; case 201: - if ((0x8000000080L & l) != 0L) + if ((0x4000000040000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 200; break; - case 203: + case 202: + if ((0x8000000080L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 201; + break; + case 204: if ((0x8000000080000L & l) != 0L && kind > 77) kind = 77; break; - case 204: + case 205: if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 203; + jjstateSet[jjnewStateCnt++] = 204; break; - case 206: + case 207: if ((0x8000000080000L & l) != 0L && kind > 78) kind = 78; break; - case 208: + case 209: if ((0x400000004000000L & l) != 0L && kind > 79) kind = 79; break; - case 209: + case 210: if ((0x10000000100L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 208; + jjstateSet[jjnewStateCnt++] = 209; break; - case 211: + case 212: if ((0x400000004000000L & l) != 0L && kind > 80) kind = 80; break; - case 212: + case 213: if ((0x10000000100L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 211; + jjstateSet[jjnewStateCnt++] = 212; break; - case 213: + case 214: if ((0x80000000800L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 212; + jjstateSet[jjnewStateCnt++] = 213; break; - case 216: + case 217: if ((0x7fffffe07fffffeL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddTwoStates(217, 218); + jjCheckNAddTwoStates(218, 219); break; - case 217: + case 218: if ((0x7fffffe87fffffeL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddTwoStates(217, 218); - break; - case 218: - if (curChar == 92) - jjCheckNAddTwoStates(219, 220); + jjCheckNAddTwoStates(218, 219); break; case 219: - if ((0x7fffffffffffffffL & l) == 0L) - break; - if (kind > 81) - kind = 81; - jjCheckNAddTwoStates(217, 218); + if (curChar == 92) + jjCheckNAddTwoStates(220, 221); break; case 220: - if ((0x7e0000007eL & l) == 0L) + if ((0x7fffffffffffffffL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(486, 489); + jjCheckNAddTwoStates(218, 219); break; - case 222: + case 221: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(490, 496); + jjCheckNAddStates(487, 490); break; case 223: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(497, 499); + jjCheckNAddStates(491, 497); break; case 224: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(500, 503); + jjCheckNAddStates(498, 500); break; case 225: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(504, 508); + jjCheckNAddStates(501, 504); break; case 226: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(509, 514); + jjCheckNAddStates(505, 509); break; - case 228: - if (curChar == 92) - jjCheckNAddTwoStates(219, 229); - break; - case 229: + case 227: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(515, 518); + jjCheckNAddStates(510, 515); + break; + case 229: + if (curChar == 92) + jjCheckNAddTwoStates(220, 230); break; case 230: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(519, 525); + jjCheckNAddStates(516, 519); break; case 231: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(526, 528); + jjCheckNAddStates(520, 526); break; case 232: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(529, 532); + jjCheckNAddStates(527, 529); break; case 233: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(533, 537); + jjCheckNAddStates(530, 533); break; case 234: if ((0x7e0000007eL & l) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddStates(538, 543); + jjCheckNAddStates(534, 538); break; case 235: + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 81) + kind = 81; + jjCheckNAddStates(539, 544); + break; + case 236: if ((0x20000000200000L & l) != 0L) - jjAddStates(812, 814); + jjAddStates(810, 812); break; - case 237: - case 241: + case 238: + case 242: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(550, 553); + jjCheckNAddStates(551, 554); break; - case 240: + case 241: if (curChar == 92) - jjAddStates(829, 830); - break; - case 242: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(554, 558); + jjAddStates(827, 828); break; - case 244: + case 243: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(559, 566); + jjCheckNAddStates(555, 559); break; case 245: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(567, 570); + jjCheckNAddStates(560, 567); break; case 246: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(571, 575); + jjCheckNAddStates(568, 571); break; case 247: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(576, 581); + jjCheckNAddStates(572, 576); break; case 248: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(582, 588); + jjCheckNAddStates(577, 582); break; - case 250: - case 255: + case 249: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(583, 589); + break; + case 251: + case 256: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(589, 592); + jjCheckNAddStates(590, 593); break; - case 252: + case 253: if (curChar == 92) - jjAddStates(831, 834); + jjAddStates(829, 832); break; - case 254: + case 255: if (curChar == 92) - jjAddStates(835, 836); + jjAddStates(833, 834); break; - case 256: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(593, 598); - break; - case 258: + case 257: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(599, 607); + jjCheckNAddStates(594, 599); break; case 259: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(608, 612); + jjCheckNAddStates(600, 608); break; case 260: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(613, 618); + jjCheckNAddStates(609, 613); break; case 261: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(619, 625); + jjCheckNAddStates(614, 619); break; case 262: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(626, 633); + jjCheckNAddStates(620, 626); break; - case 267: - case 272: + case 263: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(627, 634); + break; + case 268: + case 273: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(634, 637); + jjCheckNAddStates(635, 638); break; - case 269: + case 270: if (curChar == 92) - jjAddStates(837, 840); + jjAddStates(835, 838); break; - case 271: + case 272: if (curChar == 92) - jjAddStates(841, 842); + jjAddStates(839, 840); break; - case 273: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(638, 643); - break; - case 275: + case 274: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(644, 652); + jjCheckNAddStates(639, 644); break; case 276: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(653, 657); + jjCheckNAddStates(645, 653); break; case 277: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(658, 663); + jjCheckNAddStates(654, 658); break; case 278: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(664, 670); + jjCheckNAddStates(659, 664); break; case 279: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(671, 678); + jjCheckNAddStates(665, 671); break; - case 284: - if ((0x100000001000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 236; + case 280: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(672, 679); break; case 285: + if ((0x100000001000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 237; + break; + case 286: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 284; + jjstateSet[jjnewStateCnt++] = 285; break; - case 293: + case 294: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjAddStates(695, 700); - break; - case 294: - if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 295; + jjAddStates(696, 701); break; case 295: if ((0x7e0000007eL & l) != 0L) @@ -3487,15 +3487,15 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 296: if ((0x7e0000007eL & l) != 0L) - jjCheckNAdd(297); + jjstateSet[jjnewStateCnt++] = 297; break; case 297: - if ((0x7e0000007eL & l) != 0L && kind > 99) - kind = 99; + if ((0x7e0000007eL & l) != 0L) + jjCheckNAdd(298); break; case 298: - if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 299; + if ((0x7e0000007eL & l) != 0L && kind > 99) + kind = 99; break; case 299: if ((0x7e0000007eL & l) != 0L) @@ -3506,173 +3506,173 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 301; break; case 301: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 302; + break; + case 302: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjstateSet[jjnewStateCnt++] = 289; - break; - case 302: - if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 303; + jjstateSet[jjnewStateCnt++] = 290; break; case 303: if ((0x7e0000007eL & l) != 0L) jjstateSet[jjnewStateCnt++] = 304; break; case 304: + if ((0x7e0000007eL & l) != 0L) + jjstateSet[jjnewStateCnt++] = 305; + break; + case 305: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjstateSet[jjnewStateCnt++] = 305; + jjstateSet[jjnewStateCnt++] = 306; break; - case 306: + case 307: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 307; + jjstateSet[jjnewStateCnt++] = 308; break; - case 307: + case 308: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjstateSet[jjnewStateCnt++] = 308; + jjstateSet[jjnewStateCnt++] = 309; break; - case 310: + case 311: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjstateSet[jjnewStateCnt++] = 311; + jjstateSet[jjnewStateCnt++] = 312; break; - case 319: + case 320: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddTwoStates(320, 326); - break; - case 321: - if ((0x7e0000007eL & l) == 0L) - break; - if (kind > 99) - kind = 99; - jjstateSet[jjnewStateCnt++] = 322; + jjCheckNAddTwoStates(321, 327); break; case 322: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAddStates(711, 714); + jjstateSet[jjnewStateCnt++] = 323; break; case 323: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAdd(297); + jjCheckNAddStates(712, 715); break; case 324: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAddTwoStates(297, 323); + jjCheckNAdd(298); break; case 325: if ((0x7e0000007eL & l) == 0L) break; if (kind > 99) kind = 99; - jjCheckNAddStates(715, 717); + jjCheckNAddTwoStates(298, 324); break; case 326: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(718, 722); + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 99) + kind = 99; + jjCheckNAddStates(716, 718); break; case 327: if ((0x7e0000007eL & l) != 0L) - jjCheckNAdd(320); + jjCheckNAddStates(719, 723); break; case 328: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddTwoStates(327, 320); + jjCheckNAdd(321); break; case 329: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(723, 725); + jjCheckNAddTwoStates(328, 321); break; case 330: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(726, 729); + jjCheckNAddStates(724, 726); break; case 331: - if (curChar == 92) - jjCheckNAddStates(804, 807); + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(727, 730); break; case 332: - if ((0x7e0000007eL & l) == 0L) - break; - if (kind > 60) - kind = 60; - jjCheckNAddStates(730, 733); + if (curChar == 92) + jjCheckNAddStates(802, 805); break; case 333: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(734, 740); + jjCheckNAddStates(731, 734); break; case 334: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(741, 743); + jjCheckNAddStates(735, 741); break; case 335: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(744, 747); + jjCheckNAddStates(742, 744); break; case 336: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(748, 752); + jjCheckNAddStates(745, 748); break; case 337: if ((0x7e0000007eL & l) == 0L) break; if (kind > 60) kind = 60; - jjCheckNAddStates(753, 758); + jjCheckNAddStates(749, 753); break; case 338: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(759, 763); + if ((0x7e0000007eL & l) == 0L) + break; + if (kind > 60) + kind = 60; + jjCheckNAddStates(754, 759); break; case 339: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(764, 771); + jjCheckNAddStates(760, 764); break; case 340: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(772, 775); - break; - case 341: - if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(776, 780); + jjCheckNAddStates(765, 772); break; case 342: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(781, 786); + jjCheckNAddStates(773, 777); break; case 343: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddStates(787, 793); + jjCheckNAddStates(778, 783); + break; + case 344: + if ((0x7e0000007eL & l) != 0L) + jjCheckNAddStates(784, 790); break; default : break; } @@ -3686,16 +3686,6 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 400: - if ((jjbitVec0[i2] & l2) != 0L) - { - if (kind > 60) - kind = 60; - jjCheckNAddTwoStates(117, 118); - } - if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(0, 2); - break; case 96: case 100: if ((jjbitVec0[i2] & l2) == 0L) @@ -3704,7 +3694,7 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 88; jjCheckNAddTwoStates(98, 99); break; - case 401: + case 402: case 98: if ((jjbitVec0[i2] & l2) == 0L) break; @@ -3712,12 +3702,22 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 88; jjCheckNAddTwoStates(98, 99); break; + case 401: + if ((jjbitVec0[i2] & l2) != 0L) + { + if (kind > 60) + kind = 60; + jjCheckNAddTwoStates(117, 118); + } + if ((jjbitVec0[i2] & l2) != 0L) + jjCheckNAddStates(5, 8); + break; case 4: if ((jjbitVec0[i2] & l2) == 0L) break; if (kind > 32) kind = 32; - jjCheckNAddStates(799, 803); + jjCheckNAddStates(796, 801); break; case 2: if ((jjbitVec0[i2] & l2) != 0L && kind > 5) @@ -3727,17 +3727,17 @@ private int jjMoveNfa_0(int startState, int curPos) case 12: case 20: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(122, 124); + jjCheckNAddStates(123, 125); break; case 30: case 35: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(114, 117); + jjCheckNAddStates(115, 118); break; case 47: case 52: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(110, 113); + jjCheckNAddStates(111, 114); break; case 66: case 68: @@ -3765,33 +3765,33 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddTwoStates(117, 118); break; case 127: - case 130: + case 131: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(0, 2); + jjCheckNAddStates(5, 8); break; - case 217: - case 219: - case 227: + case 218: + case 220: + case 228: if ((jjbitVec0[i2] & l2) == 0L) break; if (kind > 81) kind = 81; - jjCheckNAddTwoStates(217, 218); + jjCheckNAddTwoStates(218, 219); break; - case 237: - case 241: + case 238: + case 242: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(550, 553); + jjCheckNAddStates(551, 554); break; - case 250: - case 255: + case 251: + case 256: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(589, 592); + jjCheckNAddStates(590, 593); break; - case 267: - case 272: + case 268: + case 273: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(634, 637); + jjCheckNAddStates(635, 638); break; default : break; } @@ -3804,7 +3804,7 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 399 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 400 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -3960,59 +3960,59 @@ private int jjMoveStringLiteralDfa1_2(long active0) return 2; } static final int[] jjnextStates = { - 127, 128, 129, 214, 215, 216, 227, 228, 345, 346, 347, 348, 349, 350, 164, 351, - 352, 353, 167, 354, 355, 356, 170, 357, 358, 359, 173, 360, 361, 362, 176, 363, - 364, 365, 179, 366, 367, 368, 182, 369, 370, 371, 185, 372, 373, 374, 188, 375, - 376, 377, 192, 378, 379, 380, 196, 381, 382, 383, 201, 384, 385, 386, 204, 387, - 388, 389, 206, 390, 391, 392, 209, 393, 394, 395, 213, 396, 397, 398, 215, 216, - 227, 228, 162, 163, 165, 168, 171, 174, 177, 180, 183, 186, 189, 193, 197, 202, - 205, 207, 210, 214, 158, 159, 139, 146, 147, 156, 64, 65, 76, 77, 47, 48, - 49, 51, 30, 31, 32, 34, 7, 8, 20, 21, 9, 10, 11, 9, 14, 10, - 11, 15, 9, 16, 14, 10, 11, 17, 18, 19, 9, 14, 10, 11, 9, 16, - 14, 10, 11, 9, 16, 14, 10, 11, 17, 9, 16, 14, 10, 11, 17, 18, - 14, 9, 10, 11, 23, 24, 14, 9, 10, 11, 25, 26, 27, 14, 9, 10, - 11, 24, 14, 9, 10, 11, 24, 14, 9, 10, 11, 25, 24, 14, 9, 10, - 11, 25, 26, 30, 37, 31, 32, 34, 38, 30, 39, 37, 31, 32, 34, 40, - 41, 42, 30, 37, 31, 32, 34, 30, 39, 37, 31, 32, 34, 30, 39, 37, - 31, 32, 34, 40, 30, 39, 37, 31, 32, 34, 40, 41, 47, 54, 48, 49, - 51, 55, 47, 56, 54, 48, 49, 51, 57, 58, 59, 47, 54, 48, 49, 51, - 47, 56, 54, 48, 49, 51, 47, 56, 54, 48, 49, 51, 57, 47, 56, 54, - 48, 49, 51, 57, 58, 66, 70, 67, 71, 66, 72, 70, 67, 73, 74, 75, - 66, 70, 67, 66, 72, 70, 67, 66, 72, 70, 67, 73, 66, 72, 70, 67, - 73, 74, 70, 66, 67, 79, 80, 70, 66, 67, 81, 82, 83, 70, 66, 67, - 80, 70, 66, 67, 80, 70, 66, 67, 81, 80, 70, 66, 67, 81, 82, 85, - 89, 86, 90, 85, 91, 89, 86, 92, 93, 94, 85, 89, 86, 85, 91, 89, - 86, 85, 91, 89, 86, 92, 85, 91, 89, 86, 92, 93, 98, 102, 99, 103, - 98, 104, 102, 99, 105, 106, 107, 98, 102, 99, 98, 104, 102, 99, 98, 104, - 102, 99, 105, 98, 104, 102, 99, 105, 106, 102, 98, 99, 111, 112, 102, 98, - 99, 113, 114, 115, 102, 98, 99, 112, 102, 98, 99, 112, 102, 98, 99, 113, - 112, 102, 98, 99, 113, 114, 117, 121, 118, 122, 117, 123, 121, 118, 124, 125, - 126, 117, 121, 118, 117, 123, 121, 118, 117, 123, 121, 118, 124, 117, 123, 121, - 118, 124, 125, 127, 132, 128, 129, 133, 127, 134, 132, 128, 129, 135, 136, 137, - 127, 132, 128, 129, 127, 134, 132, 128, 129, 127, 134, 132, 128, 129, 135, 127, - 134, 132, 128, 129, 135, 136, 217, 221, 218, 222, 217, 223, 221, 218, 224, 225, - 226, 217, 221, 218, 217, 223, 221, 218, 217, 223, 221, 218, 224, 217, 223, 221, - 218, 224, 225, 221, 217, 218, 230, 231, 221, 217, 218, 232, 233, 234, 221, 217, - 218, 231, 221, 217, 218, 231, 221, 217, 218, 232, 231, 221, 217, 218, 232, 233, - 237, 249, 266, 239, 240, 283, 237, 238, 239, 240, 237, 239, 240, 243, 244, 237, - 245, 239, 240, 243, 246, 247, 248, 237, 239, 240, 243, 237, 245, 239, 240, 243, - 237, 245, 239, 240, 243, 246, 237, 245, 239, 240, 243, 246, 247, 250, 251, 252, - 254, 250, 257, 251, 252, 254, 258, 250, 259, 257, 251, 252, 254, 260, 261, 262, - 250, 257, 251, 252, 254, 250, 259, 257, 251, 252, 254, 250, 259, 257, 251, 252, - 254, 260, 250, 259, 257, 251, 252, 254, 260, 261, 267, 268, 269, 271, 267, 274, - 268, 269, 271, 275, 267, 276, 274, 268, 269, 271, 277, 278, 279, 267, 274, 268, - 269, 271, 267, 276, 274, 268, 269, 271, 267, 276, 274, 268, 269, 271, 277, 267, - 276, 274, 268, 269, 271, 277, 278, 237, 249, 266, 238, 239, 240, 283, 287, 293, - 289, 290, 291, 292, 289, 290, 291, 294, 298, 302, 306, 310, 314, 289, 312, 313, - 289, 315, 316, 317, 289, 315, 316, 297, 323, 324, 325, 297, 323, 324, 327, 320, - 328, 329, 330, 327, 320, 328, 327, 320, 328, 329, 121, 117, 118, 333, 334, 121, - 117, 118, 335, 336, 337, 121, 117, 118, 334, 121, 117, 118, 334, 121, 117, 118, - 335, 334, 121, 117, 118, 335, 336, 132, 127, 128, 129, 339, 340, 132, 127, 128, - 129, 341, 342, 343, 132, 127, 128, 129, 340, 132, 127, 128, 129, 340, 132, 127, - 128, 129, 341, 340, 132, 127, 128, 129, 341, 342, 396, 215, 216, 227, 228, 117, - 127, 128, 129, 118, 119, 332, 130, 338, 96, 97, 108, 109, 285, 286, 318, 33, - 43, 45, 44, 35, 36, 50, 60, 62, 61, 52, 53, 87, 88, 241, 242, 253, - 263, 265, 264, 255, 256, 270, 280, 282, 281, 272, 273, + 215, 216, 217, 228, 229, 127, 128, 129, 130, 346, 347, 348, 349, 350, 351, 165, + 352, 353, 354, 168, 355, 356, 357, 171, 358, 359, 360, 174, 361, 362, 363, 177, + 364, 365, 366, 180, 367, 368, 369, 183, 370, 371, 372, 186, 373, 374, 375, 189, + 376, 377, 378, 193, 379, 380, 381, 197, 382, 383, 384, 202, 385, 386, 387, 205, + 388, 389, 390, 207, 391, 392, 393, 210, 394, 395, 396, 214, 397, 398, 399, 216, + 217, 228, 229, 163, 164, 166, 169, 172, 175, 178, 181, 184, 187, 190, 194, 198, + 203, 206, 208, 211, 215, 159, 160, 140, 147, 148, 157, 64, 65, 76, 77, 47, + 48, 49, 51, 30, 31, 32, 34, 7, 8, 20, 21, 9, 10, 11, 9, 14, + 10, 11, 15, 9, 16, 14, 10, 11, 17, 18, 19, 9, 14, 10, 11, 9, + 16, 14, 10, 11, 9, 16, 14, 10, 11, 17, 9, 16, 14, 10, 11, 17, + 18, 14, 9, 10, 11, 23, 24, 14, 9, 10, 11, 25, 26, 27, 14, 9, + 10, 11, 24, 14, 9, 10, 11, 24, 14, 9, 10, 11, 25, 24, 14, 9, + 10, 11, 25, 26, 30, 37, 31, 32, 34, 38, 30, 39, 37, 31, 32, 34, + 40, 41, 42, 30, 37, 31, 32, 34, 30, 39, 37, 31, 32, 34, 30, 39, + 37, 31, 32, 34, 40, 30, 39, 37, 31, 32, 34, 40, 41, 47, 54, 48, + 49, 51, 55, 47, 56, 54, 48, 49, 51, 57, 58, 59, 47, 54, 48, 49, + 51, 47, 56, 54, 48, 49, 51, 47, 56, 54, 48, 49, 51, 57, 47, 56, + 54, 48, 49, 51, 57, 58, 66, 70, 67, 71, 66, 72, 70, 67, 73, 74, + 75, 66, 70, 67, 66, 72, 70, 67, 66, 72, 70, 67, 73, 66, 72, 70, + 67, 73, 74, 70, 66, 67, 79, 80, 70, 66, 67, 81, 82, 83, 70, 66, + 67, 80, 70, 66, 67, 80, 70, 66, 67, 81, 80, 70, 66, 67, 81, 82, + 85, 89, 86, 90, 85, 91, 89, 86, 92, 93, 94, 85, 89, 86, 85, 91, + 89, 86, 85, 91, 89, 86, 92, 85, 91, 89, 86, 92, 93, 98, 102, 99, + 103, 98, 104, 102, 99, 105, 106, 107, 98, 102, 99, 98, 104, 102, 99, 98, + 104, 102, 99, 105, 98, 104, 102, 99, 105, 106, 102, 98, 99, 111, 112, 102, + 98, 99, 113, 114, 115, 102, 98, 99, 112, 102, 98, 99, 112, 102, 98, 99, + 113, 112, 102, 98, 99, 113, 114, 117, 121, 118, 122, 117, 123, 121, 118, 124, + 125, 126, 117, 121, 118, 117, 123, 121, 118, 117, 123, 121, 118, 124, 117, 123, + 121, 118, 124, 125, 127, 129, 130, 133, 134, 127, 135, 129, 130, 133, 136, 137, + 138, 127, 129, 130, 133, 127, 135, 129, 130, 133, 127, 135, 129, 130, 133, 136, + 127, 135, 129, 130, 133, 136, 137, 218, 222, 219, 223, 218, 224, 222, 219, 225, + 226, 227, 218, 222, 219, 218, 224, 222, 219, 218, 224, 222, 219, 225, 218, 224, + 222, 219, 225, 226, 222, 218, 219, 231, 232, 222, 218, 219, 233, 234, 235, 222, + 218, 219, 232, 222, 218, 219, 232, 222, 218, 219, 233, 232, 222, 218, 219, 233, + 234, 238, 250, 267, 240, 241, 284, 238, 239, 240, 241, 238, 240, 241, 244, 245, + 238, 246, 240, 241, 244, 247, 248, 249, 238, 240, 241, 244, 238, 246, 240, 241, + 244, 238, 246, 240, 241, 244, 247, 238, 246, 240, 241, 244, 247, 248, 251, 252, + 253, 255, 251, 258, 252, 253, 255, 259, 251, 260, 258, 252, 253, 255, 261, 262, + 263, 251, 258, 252, 253, 255, 251, 260, 258, 252, 253, 255, 251, 260, 258, 252, + 253, 255, 261, 251, 260, 258, 252, 253, 255, 261, 262, 268, 269, 270, 272, 268, + 275, 269, 270, 272, 276, 268, 277, 275, 269, 270, 272, 278, 279, 280, 268, 275, + 269, 270, 272, 268, 277, 275, 269, 270, 272, 268, 277, 275, 269, 270, 272, 278, + 268, 277, 275, 269, 270, 272, 278, 279, 238, 250, 267, 239, 240, 241, 284, 288, + 294, 290, 291, 292, 293, 290, 291, 292, 295, 299, 303, 307, 311, 315, 290, 313, + 314, 290, 316, 317, 318, 290, 316, 317, 298, 324, 325, 326, 298, 324, 325, 328, + 321, 329, 330, 331, 328, 321, 329, 328, 321, 329, 330, 121, 117, 118, 334, 335, + 121, 117, 118, 336, 337, 338, 121, 117, 118, 335, 121, 117, 118, 335, 121, 117, + 118, 336, 335, 121, 117, 118, 336, 337, 127, 129, 130, 133, 340, 341, 127, 129, + 130, 133, 342, 343, 344, 341, 127, 129, 130, 133, 341, 127, 129, 130, 133, 342, + 341, 127, 129, 130, 133, 342, 343, 397, 216, 217, 228, 229, 117, 127, 128, 129, + 130, 118, 119, 333, 131, 339, 96, 97, 108, 109, 286, 287, 319, 33, 43, 45, + 44, 35, 36, 50, 60, 62, 61, 52, 53, 87, 88, 242, 243, 254, 264, 266, + 265, 256, 257, 271, 281, 283, 282, 273, 274, }; /** Token literal values. */ @@ -4055,8 +4055,8 @@ static final long[] jjtoMore = { 0x26cL, 0x0L, }; protected CharStream input_stream; -private final int[] jjrounds = new int[399]; -private final int[] jjstateSet = new int[798]; +private final int[] jjrounds = new int[400]; +private final int[] jjstateSet = new int[800]; private final StringBuilder jjimage = new StringBuilder(); private StringBuilder image = jjimage; private int jjimageLen; @@ -4085,7 +4085,7 @@ private void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 399; i-- > 0;) + for (i = 400; i-- > 0;) jjrounds[i] = 0x80000000; } diff --git a/sass/tests/resources/scss/mixins.scss b/sass/tests/resources/scss/mixins.scss index 52e03d62c1..db972f6edc 100644 --- a/sass/tests/resources/scss/mixins.scss +++ b/sass/tests/resources/scss/mixins.scss @@ -6,7 +6,7 @@ font-weight: bold; } -@mixin rounded-borders($thickness, $radius : 3px) { +@mixin rounded-borders ($thickness, $radius : 3px) { border: $thickness solid black; -webkit-border-radius: $radius; -moz-border-radius: $radius;