diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java index 9c5b55a8..11cb11f6 100644 --- a/prism/src/parser/PrismParser.java +++ b/prism/src/parser/PrismParser.java @@ -3431,6 +3431,34 @@ ret = new ExpressionIdent(ident); ret.setPosition(begin, getToken(0)); {if ("" ! throw new Error("Missing return statement in function"); } +// A quoted string ("text"), returns the unquoted text + static final public QuotedString QuotedString() throws ParseException {String s; + Token begin; +begin = getToken(1); + switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { + case REG_QUOTED_IDENT:{ + jj_consume_token(REG_QUOTED_IDENT); +s = getToken(0).image; + break; + } + case REG_QUOTED_STRING:{ + jj_consume_token(REG_QUOTED_STRING); +s = getToken(0).image; + break; + } + default: + jj_la1[96] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } +try { + {if ("" != null) return QuotedString.fromQuoted(s);} + } catch (PrismLangException e) { + {if (true) throw new ParseException(e.getMessage() + ", at line " + begin.next.beginLine + ", column " + begin.next.beginColumn +".");} + } + throw new Error("Missing return statement in function"); + } + // Identifier or min/max keyword (returns ExpressionIdent, storing position info) static final public ExpressionIdent IdentifierExpressionMinMax() throws ParseException {String ident; @@ -3451,7 +3479,7 @@ ident="max"; break; } default: - jj_la1[96] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3488,7 +3516,7 @@ int EqNeq() throws ParseException { break; } default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3520,7 +3548,7 @@ int LtGt() throws ParseException { break; } default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3546,7 +3574,7 @@ begin = getToken(1); break; } default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; ; } jj_consume_token(0); @@ -3703,21 +3731,6 @@ fl.setLHS(s); finally { jj_save(17, xla); } } - static private boolean jj_3R_166() - { - if (jj_3R_29()) return true; - return false; - } - - static private boolean jj_3R_48() - { - if (jj_3R_57()) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_58()) jj_scanpos = xsp; - return false; - } - static private boolean jj_3R_184() { if (jj_scan_token(OR)) return true; @@ -5025,6 +5038,24 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_56() + { + if (jj_scan_token(LE)) return true; + return false; + } + + static private boolean jj_3R_55() + { + if (jj_scan_token(GE)) return true; + return false; + } + + static private boolean jj_3R_54() + { + if (jj_scan_token(LT)) return true; + return false; + } + static private boolean jj_3R_35() { if (jj_scan_token(S)) return true; @@ -5042,6 +5073,29 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_53() + { + if (jj_scan_token(GT)) return true; + return false; + } + + static private boolean jj_3R_47() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_53()) { + jj_scanpos = xsp; + if (jj_3R_54()) { + jj_scanpos = xsp; + if (jj_3R_55()) { + jj_scanpos = xsp; + if (jj_3R_56()) return true; + } + } + } + return false; + } + static private boolean jj_3R_85() { if (jj_scan_token(QMARK)) return true; @@ -5079,6 +5133,29 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_121() + { + if (jj_scan_token(NE)) return true; + return false; + } + + static private boolean jj_3R_117() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_120()) { + jj_scanpos = xsp; + if (jj_3R_121()) return true; + } + return false; + } + + static private boolean jj_3R_120() + { + if (jj_scan_token(EQ)) return true; + return false; + } + static private boolean jj_3R_170() { if (jj_3R_49()) return true; @@ -5124,30 +5201,12 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_56() - { - if (jj_scan_token(LE)) return true; - return false; - } - static private boolean jj_3R_96() { if (jj_3R_34()) return true; return false; } - static private boolean jj_3R_55() - { - if (jj_scan_token(GE)) return true; - return false; - } - - static private boolean jj_3R_54() - { - if (jj_scan_token(LT)) return true; - return false; - } - static private boolean jj_3R_59() { if (jj_scan_token(LBRACE)) return true; @@ -5161,29 +5220,6 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_53() - { - if (jj_scan_token(GT)) return true; - return false; - } - - static private boolean jj_3R_47() - { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_53()) { - jj_scanpos = xsp; - if (jj_3R_54()) { - jj_scanpos = xsp; - if (jj_3R_55()) { - jj_scanpos = xsp; - if (jj_3R_56()) return true; - } - } - } - return false; - } - static private boolean jj_3R_91() { if (jj_scan_token(EQ)) return true; @@ -5262,6 +5298,12 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_50() + { + if (jj_scan_token(REG_IDENTPRIME)) return true; + return false; + } + static private boolean jj_3R_78() { Token xsp; @@ -5285,29 +5327,6 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_121() - { - if (jj_scan_token(NE)) return true; - return false; - } - - static private boolean jj_3R_117() - { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_120()) { - jj_scanpos = xsp; - if (jj_3R_121()) return true; - } - return false; - } - - static private boolean jj_3R_120() - { - if (jj_scan_token(EQ)) return true; - return false; - } - static private boolean jj_3R_63() { if (jj_3R_77()) return true; @@ -5370,12 +5389,6 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_50() - { - if (jj_scan_token(REG_IDENTPRIME)) return true; - return false; - } - static private boolean jj_3R_192() { if (jj_scan_token(MAX)) return true; @@ -5519,6 +5532,21 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_166() + { + if (jj_3R_29()) return true; + return false; + } + + static private boolean jj_3R_48() + { + if (jj_3R_57()) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_58()) jj_scanpos = xsp; + return false; + } + static private boolean jj_initialized_once = false; /** Generated Token Manager. */ static public PrismParserTokenManager token_source; @@ -5531,7 +5559,7 @@ fl.setLHS(s); static private Token jj_scanpos, jj_lastpos; static private int jj_la; static private int jj_gen; - static final private int[] jj_la1 = new int[100]; + static final private int[] jj_la1 = new int[101]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -5541,13 +5569,13 @@ fl.setLHS(s); jj_la1_init_2(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x514404c0,0x504404c0,0x1000000,0xb01a0848,0x0,0xb01a0848,0xb01a0848,0x0,0xb01a0848,0x400,0x40000000,0x80,0x40000480,0x8000210,0x8000210,0x0,0x40,0x0,0x1000000,0x8000030,0x0,0x2000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00000,0x0,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0xa01a0808,0x0,0xa0000000,0xa0000000,0x0,0x20000,0x0,0xa0000000,0x0,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0ba0808,0xa0ba0808,0x0,0x0,0xa4ba0908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0xa0000000,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0x514404c0,0x504404c0,0x1000000,0xb01a0848,0x0,0xb01a0848,0xb01a0848,0x0,0xb01a0848,0x400,0x40000000,0x80,0x40000480,0x8000210,0x8000210,0x0,0x40,0x0,0x1000000,0x8000030,0x0,0x2000000,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa00000,0x0,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0xa0ba0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0x0,0x0,0x0,0x0,0x0,0x0,0xa01a0808,0xa01a0808,0x0,0xa0000000,0xa0000000,0x0,0x20000,0x0,0xa0000000,0x0,0x0,0x0,0xa0000000,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0ba0808,0xa0ba0808,0x0,0x0,0xa4ba0908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0x0,0x0,0xa0000000,0x0,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x187c5,0x83c4,0x10401,0x40127ab8,0x8000000,0x40127ab8,0x40127ab8,0x8000000,0x40127ab8,0x40,0x4,0x8000,0x8144,0x0,0x0,0x280,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4012783a,0x200000,0x40020000,0x10000000,0x4012783a,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x0,0x40000000,0xc2000,0x0,0xc2000,0x2,0x0,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x0,0x0,0x800000,0x1000000,0x400000,0x200000,0x40127838,0x0,0x0,0x0,0x0,0x0,0x0,0x40027838,0x40027838,0x40000000,0x0,0x0,0x10000000,0x20000,0x40000000,0x0,0x38,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x3800,0x0,0x4012783a,0x4012783a,0x0,0x4000,0x4012783a,0x0,0x3838,0x40003838,0x10000000,0x0,0x0,0x0,0x600000,0x10000000,0x0,0x0,0x0,0x4000000,}; + jj_la1_1 = new int[] {0x187c5,0x83c4,0x10401,0x40127ab8,0x8000000,0x40127ab8,0x40127ab8,0x8000000,0x40127ab8,0x40,0x4,0x8000,0x8144,0x0,0x0,0x280,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4012783a,0x200000,0x40020000,0x10000000,0x4012783a,0x0,0x0,0x10000000,0x0,0x10000000,0x10000000,0x0,0x40000000,0xc2000,0x0,0xc2000,0x2,0x0,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x4012783a,0x0,0x0,0x800000,0x1000000,0x400000,0x200000,0x40127838,0x0,0x0,0x0,0x0,0x0,0x0,0x40027838,0x40027838,0x40000000,0x0,0x0,0x10000000,0x20000,0x40000000,0x0,0x38,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x40000000,0x0,0x0,0x3800,0x0,0x4012783a,0x4012783a,0x0,0x4000,0x4012783a,0x0,0x3838,0x40003838,0x10000000,0x0,0x0,0x0,0x600000,0x10000000,0x0,0x0,0x0,0x0,0x4000000,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x0,0x3608404,0x0,0x3608404,0x3608404,0x0,0x3608404,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x1000000,0x0,0x1,0x1000000,0x4000,0x3608404,0x0,0x0,0x0,0x3608405,0x1000000,0x1,0x0,0x20010,0x0,0x0,0x20010,0x3000000,0x0,0x3341,0x0,0x0,0x3341,0x3608404,0x3608404,0x3608404,0x3608404,0x3608404,0x3341,0x100000,0x0,0x0,0x0,0x0,0x3608404,0xc0,0x3300,0xc000,0xc000,0x30000,0x30000,0x3608404,0x3600404,0x0,0x0,0x1000000,0x0,0x600000,0x0,0x3340,0x0,0x10,0x10,0x0,0x0,0x3340,0x10,0x0,0x10,0x3340,0x0,0x10,0x3608404,0x3608404,0x20000,0x0,0x3608404,0x404,0x0,0x0,0x0,0x1200000,0x10000,0x1200000,0x1004000,0x0,0x1000000,0xc0,0x3300,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x0,0x3608404,0x0,0x3608404,0x3608404,0x0,0x3608404,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x1,0x1000000,0x0,0x1,0x1000000,0x4000,0x3608404,0x0,0x0,0x0,0x3608405,0x1000000,0x1,0x0,0x20010,0x0,0x0,0x20010,0x3000000,0x0,0x3341,0x0,0x0,0x3341,0x3608404,0x3608404,0x3608404,0x3608404,0x3608404,0x3341,0x100000,0x0,0x0,0x0,0x0,0x3608404,0xc0,0x3300,0xc000,0xc000,0x30000,0x30000,0x3608404,0x3600404,0x0,0x0,0x1000000,0x0,0x600000,0x0,0x3340,0x0,0x10,0x10,0x0,0x0,0x3340,0x10,0x0,0x10,0x3340,0x0,0x10,0x3608404,0x3608404,0x20000,0x0,0x3608404,0x404,0x0,0x0,0x0,0x1200000,0x10000,0x1200000,0x1004000,0x0,0x6000000,0x1000000,0xc0,0x3300,0x0,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[18]; static private boolean jj_rescan = false; @@ -5571,7 +5599,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 100; i++) jj_la1[i] = -1; + for (int i = 0; i < 101; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5586,7 +5614,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 100; i++) jj_la1[i] = -1; + for (int i = 0; i < 101; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5604,7 +5632,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 100; i++) jj_la1[i] = -1; + for (int i = 0; i < 101; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5615,7 +5643,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 100; i++) jj_la1[i] = -1; + for (int i = 0; i < 101; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5632,7 +5660,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 100; i++) jj_la1[i] = -1; + for (int i = 0; i < 101; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5642,7 +5670,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 100; i++) jj_la1[i] = -1; + for (int i = 0; i < 101; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5755,12 +5783,12 @@ fl.setLHS(s); /** Generate ParseException. */ static public ParseException generateParseException() { jj_expentries.clear(); - boolean[] la1tokens = new boolean[92]; + boolean[] la1tokens = new boolean[93]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 100; i++) { + for (int i = 0; i < 101; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<", "", "", + "", "", "", }; diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java index e1109231..54224965 100644 --- a/prism/src/parser/PrismParserTokenManager.java +++ b/prism/src/parser/PrismParserTokenManager.java @@ -24,17 +24,17 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x387c5fb5ff6f0L) != 0L) - { - jjmatchedKind = 88; - return 27; - } if ((active0 & 0xc783a04a00908L) != 0L) - return 27; + return 31; if ((active1 & 0x20000L) != 0L) return 1; if ((active0 & 0x2000000000000000L) != 0L) return 11; + if ((active0 & 0x387c5fb5ff6f0L) != 0L) + { + jjmatchedKind = 88; + return 31; + } return -1; case 1: if ((active0 & 0x39fddfb5ff6f0L) != 0L) @@ -44,20 +44,22 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac jjmatchedKind = 88; jjmatchedPos = 1; } - return 27; + return 31; } return -1; case 2: + if ((active0 & 0x100e8000000L) != 0L) + return 31; if ((active0 & 0x39edd135ff6f0L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 2; - return 27; + return 31; } - if ((active0 & 0x100e8000000L) != 0L) - return 27; return -1; case 3: + if ((active0 & 0x21ad801100490L) != 0L) + return 31; if ((active0 & 0x18405124ff260L) != 0L) { if (jjmatchedPos != 3) @@ -65,95 +67,93 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac jjmatchedKind = 88; jjmatchedPos = 3; } - return 27; + return 31; } - if ((active0 & 0x21ad801100490L) != 0L) - return 27; return -1; case 4: + if ((active0 & 0x10020060L) != 0L) + return 31; if ((active0 & 0x18445024df200L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 4; - return 27; + return 31; } - if ((active0 & 0x10020060L) != 0L) - return 27; return -1; case 5: + if ((active0 & 0x1000100480200L) != 0L) + return 31; if ((active0 & 0x84440205f000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 5; - return 27; + return 31; } - if ((active0 & 0x1000100480200L) != 0L) - return 27; return -1; case 6: + if ((active0 & 0x40000041000L) != 0L) + return 31; if ((active0 & 0x80440201e000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 6; - return 27; + return 31; } - if ((active0 & 0x40000041000L) != 0L) - return 27; return -1; case 7: if ((active0 & 0x80440201e000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 7; - return 27; + return 31; } return -1; case 8: + if ((active0 & 0x2014000L) != 0L) + return 31; if ((active0 & 0x80440000a000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 8; - return 27; + return 31; } - if ((active0 & 0x2014000L) != 0L) - return 27; return -1; case 9: + if ((active0 & 0x800000008000L) != 0L) + return 31; if ((active0 & 0x4400002000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 9; - return 27; + return 31; } - if ((active0 & 0x800000008000L) != 0L) - return 27; return -1; case 10: if ((active0 & 0x4400002000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 10; - return 27; + return 31; } return -1; case 11: if ((active0 & 0x2000L) != 0L) - return 27; + return 31; if ((active0 & 0x4400000000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 11; - return 27; + return 31; } return -1; case 12: if ((active0 & 0x4000000000L) != 0L) - return 27; + return 31; if ((active0 & 0x400000000L) != 0L) { jjmatchedKind = 88; jjmatchedPos = 12; - return 27; + return 31; } return -1; case 13: @@ -161,7 +161,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac { jjmatchedKind = 88; jjmatchedPos = 13; - return 27; + return 31; } return -1; case 14: @@ -169,7 +169,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac { jjmatchedKind = 88; jjmatchedPos = 14; - return 27; + return 31; } return -1; default : @@ -228,17 +228,17 @@ static private int jjMoveStringLiteralDfa0_0(){ case 63: return jjStopAtPos(0, 84); case 65: - return jjStartNfaWithStates_0(0, 3, 27); + return jjStartNfaWithStates_0(0, 3, 31); case 67: - return jjStartNfaWithStates_0(0, 8, 27); + return jjStartNfaWithStates_0(0, 8, 31); case 69: - return jjStartNfaWithStates_0(0, 11, 27); + return jjStartNfaWithStates_0(0, 11, 31); case 70: - return jjStartNfaWithStates_0(0, 21, 27); + return jjStartNfaWithStates_0(0, 21, 31); case 71: - return jjStartNfaWithStates_0(0, 23, 27); + return jjStartNfaWithStates_0(0, 23, 31); case 73: - return jjStartNfaWithStates_0(0, 26, 27); + return jjStartNfaWithStates_0(0, 26, 31); case 80: jjmatchedKind = 37; return jjMoveStringLiteralDfa1_0(0x1800000000L, 0x0L); @@ -246,13 +246,13 @@ static private int jjMoveStringLiteralDfa0_0(){ jjmatchedKind = 45; return jjMoveStringLiteralDfa1_0(0x180000000000L, 0x0L); case 83: - return jjStartNfaWithStates_0(0, 46, 27); + return jjStartNfaWithStates_0(0, 46, 31); case 85: - return jjStartNfaWithStates_0(0, 50, 27); + return jjStartNfaWithStates_0(0, 50, 31); case 87: - return jjStartNfaWithStates_0(0, 51, 27); + return jjStartNfaWithStates_0(0, 51, 31); case 88: - return jjStartNfaWithStates_0(0, 33, 27); + return jjStartNfaWithStates_0(0, 33, 31); case 91: jjmatchedKind = 64; return jjMoveStringLiteralDfa1_0(0x0L, 0x4L); @@ -389,7 +389,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, break; case 97: if ((active0 & 0x10000000000L) != 0L) - return jjStartNfaWithStates_0(2, 40, 27); + return jjStartNfaWithStates_0(2, 40, 31); return jjMoveStringLiteralDfa3_0(active0, 0x80800000000L); case 98: return jjMoveStringLiteralDfa3_0(active0, 0x10000000L); @@ -403,13 +403,13 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, return jjMoveStringLiteralDfa3_0(active0, 0x480L); case 110: if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(2, 31, 27); + return jjStartNfaWithStates_0(2, 31, 31); return jjMoveStringLiteralDfa3_0(active0, 0x400100040L); case 111: return jjMoveStringLiteralDfa3_0(active0, 0x80c000400030L); case 112: if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_0(2, 30, 27); + return jjStartNfaWithStates_0(2, 30, 31); break; case 114: return jjMoveStringLiteralDfa3_0(active0, 0x40000L); @@ -417,7 +417,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L); case 116: if ((active0 & 0x8000000L) != 0L) - return jjStartNfaWithStates_0(2, 27, 27); + return jjStartNfaWithStates_0(2, 27, 31); return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L); case 117: return jjMoveStringLiteralDfa3_0(active0, 0x2000000000200L); @@ -427,7 +427,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, return jjMoveStringLiteralDfa3_0(active0, 0x40000000000L); case 120: if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_0(2, 29, 27); + return jjStartNfaWithStates_0(2, 29, 31); break; default : break; @@ -455,33 +455,33 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0){ return jjMoveStringLiteralDfa4_0(active0, 0x4000400200L); case 99: if ((active0 & 0x80L) != 0L) - return jjStartNfaWithStates_0(3, 7, 27); + return jjStartNfaWithStates_0(3, 7, 31); else if ((active0 & 0x400L) != 0L) - return jjStartNfaWithStates_0(3, 10, 27); + return jjStartNfaWithStates_0(3, 10, 31); else if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_0(3, 20, 27); + return jjStartNfaWithStates_0(3, 20, 31); return jjMoveStringLiteralDfa4_0(active0, 0x800000000020L); case 100: return jjMoveStringLiteralDfa4_0(active0, 0x400000000L); case 101: if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_0(3, 41, 27); + return jjStartNfaWithStates_0(3, 41, 31); else if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 49, 27); + return jjStartNfaWithStates_0(3, 49, 31); return jjMoveStringLiteralDfa4_0(active0, 0x10000000L); case 105: return jjMoveStringLiteralDfa4_0(active0, 0x3000L); case 108: if ((active0 & 0x10L) != 0L) - return jjStartNfaWithStates_0(3, 4, 27); + return jjStartNfaWithStates_0(3, 4, 31); break; case 109: return jjMoveStringLiteralDfa4_0(active0, 0x44000L); case 110: if ((active0 & 0x1000000000L) != 0L) - return jjStartNfaWithStates_0(3, 36, 27); + return jjStartNfaWithStates_0(3, 36, 31); else if ((active0 & 0x100000000000L) != 0L) - return jjStartNfaWithStates_0(3, 44, 27); + return jjStartNfaWithStates_0(3, 44, 31); break; case 114: return jjMoveStringLiteralDfa4_0(active0, 0x8000L); @@ -489,15 +489,15 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0){ return jjMoveStringLiteralDfa4_0(active0, 0x30040L); case 116: if ((active0 & 0x1000000L) != 0L) - return jjStartNfaWithStates_0(3, 24, 27); + return jjStartNfaWithStates_0(3, 24, 31); return jjMoveStringLiteralDfa4_0(active0, 0x1000000080000L); case 117: return jjMoveStringLiteralDfa4_0(active0, 0x100000000L); case 120: if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_0(3, 35, 27); + return jjStartNfaWithStates_0(3, 35, 31); else if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_0(3, 43, 27); + return jjStartNfaWithStates_0(3, 43, 31); break; default : break; @@ -518,17 +518,17 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){ return jjMoveStringLiteralDfa5_0(active0, 0x4000400000L); case 101: if ((active0 & 0x20000L) != 0L) - return jjStartNfaWithStates_0(4, 17, 27); + return jjStartNfaWithStates_0(4, 17, 31); return jjMoveStringLiteralDfa5_0(active0, 0x1000400088000L); case 104: return jjMoveStringLiteralDfa5_0(active0, 0x800000000000L); case 107: if ((active0 & 0x20L) != 0L) - return jjStartNfaWithStates_0(4, 5, 27); + return jjStartNfaWithStates_0(4, 5, 31); break; case 108: if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_0(4, 28, 27); + return jjStartNfaWithStates_0(4, 28, 31); return jjMoveStringLiteralDfa5_0(active0, 0x100000200L); case 110: return jjMoveStringLiteralDfa5_0(active0, 0x3000L); @@ -538,7 +538,7 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){ return jjMoveStringLiteralDfa5_0(active0, 0x40002000000L); case 116: if ((active0 & 0x40L) != 0L) - return jjStartNfaWithStates_0(4, 6, 27); + return jjStartNfaWithStates_0(4, 6, 31); break; case 117: return jjMoveStringLiteralDfa5_0(active0, 0x40000L); @@ -567,23 +567,23 @@ static private int jjMoveStringLiteralDfa5_0(long old0, long active0){ return jjMoveStringLiteralDfa6_0(active0, 0x40000004000L); case 101: if ((active0 & 0x200L) != 0L) - return jjStartNfaWithStates_0(5, 9, 27); + return jjStartNfaWithStates_0(5, 9, 31); else if ((active0 & 0x100000000L) != 0L) - return jjStartNfaWithStates_0(5, 32, 27); + return jjStartNfaWithStates_0(5, 32, 31); break; case 105: return jjMoveStringLiteralDfa6_0(active0, 0x2001000L); case 108: if ((active0 & 0x400000L) != 0L) - return jjStartNfaWithStates_0(5, 22, 27); + return jjStartNfaWithStates_0(5, 22, 31); return jjMoveStringLiteralDfa6_0(active0, 0x40000L); case 109: if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 48, 27); + return jjStartNfaWithStates_0(5, 48, 31); break; case 114: if ((active0 & 0x80000L) != 0L) - return jjStartNfaWithStates_0(5, 19, 27); + return jjStartNfaWithStates_0(5, 19, 31); break; case 115: return jjMoveStringLiteralDfa6_0(active0, 0x10000L); @@ -610,7 +610,7 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){ { case 97: if ((active0 & 0x40000L) != 0L) - return jjStartNfaWithStates_0(6, 18, 27); + return jjStartNfaWithStates_0(6, 18, 31); return jjMoveStringLiteralDfa7_0(active0, 0x200a000L); case 101: return jjMoveStringLiteralDfa7_0(active0, 0x400000000L); @@ -618,11 +618,11 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){ return jjMoveStringLiteralDfa7_0(active0, 0x4000000000L); case 115: if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_0(6, 42, 27); + return jjStartNfaWithStates_0(6, 42, 31); return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L); case 116: if ((active0 & 0x1000L) != 0L) - return jjStartNfaWithStates_0(6, 12, 27); + return jjStartNfaWithStates_0(6, 12, 31); return jjMoveStringLiteralDfa7_0(active0, 0x10000L); case 117: return jjMoveStringLiteralDfa7_0(active0, 0x4000L); @@ -670,17 +670,17 @@ static private int jjMoveStringLiteralDfa8_0(long old0, long active0){ return jjMoveStringLiteralDfa9_0(active0, 0x8000L); case 101: if ((active0 & 0x4000L) != 0L) - return jjStartNfaWithStates_0(8, 14, 27); + return jjStartNfaWithStates_0(8, 14, 31); break; case 105: return jjMoveStringLiteralDfa9_0(active0, 0x804000002000L); case 109: if ((active0 & 0x10000L) != 0L) - return jjStartNfaWithStates_0(8, 16, 27); + return jjStartNfaWithStates_0(8, 16, 31); return jjMoveStringLiteralDfa9_0(active0, 0x400000000L); case 116: if ((active0 & 0x2000000L) != 0L) - return jjStartNfaWithStates_0(8, 25, 27); + return jjStartNfaWithStates_0(8, 25, 31); break; default : break; @@ -701,13 +701,13 @@ static private int jjMoveStringLiteralDfa9_0(long old0, long active0){ return jjMoveStringLiteralDfa10_0(active0, 0x2000L); case 99: if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_0(9, 47, 27); + return jjStartNfaWithStates_0(9, 47, 31); break; case 105: return jjMoveStringLiteralDfa10_0(active0, 0x400000000L); case 115: if ((active0 & 0x8000L) != 0L) - return jjStartNfaWithStates_0(9, 15, 27); + return jjStartNfaWithStates_0(9, 15, 31); return jjMoveStringLiteralDfa10_0(active0, 0x4000000000L); default : break; @@ -747,7 +747,7 @@ static private int jjMoveStringLiteralDfa11_0(long old0, long active0){ return jjMoveStringLiteralDfa12_0(active0, 0x4400000000L); case 116: if ((active0 & 0x2000L) != 0L) - return jjStartNfaWithStates_0(11, 13, 27); + return jjStartNfaWithStates_0(11, 13, 31); break; default : break; @@ -766,7 +766,7 @@ static private int jjMoveStringLiteralDfa12_0(long old0, long active0){ { case 99: if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_0(12, 38, 27); + return jjStartNfaWithStates_0(12, 38, 31); break; case 115: return jjMoveStringLiteralDfa13_0(active0, 0x400000000L); @@ -821,7 +821,7 @@ static private int jjMoveStringLiteralDfa15_0(long old0, long active0){ { case 99: if ((active0 & 0x400000000L) != 0L) - return jjStartNfaWithStates_0(15, 34, 27); + return jjStartNfaWithStates_0(15, 34, 31); break; default : break; @@ -845,7 +845,7 @@ static final long[] jjbitVec2 = { static private int jjMoveNfa_0(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 27; + jjnewStateCnt = 31; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -860,12 +860,12 @@ static private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 27: + case 31: if ((0x3ff000000000000L & l) != 0L) { if (kind > 88) kind = 88; - { jjCheckNAdd(26); } + { jjCheckNAdd(22); } } else if (curChar == 39) { @@ -873,7 +873,7 @@ static private int jjMoveNfa_0(int startState, int curPos) kind = 87; } if ((0x3ff000000000000L & l) != 0L) - { jjCheckNAddTwoStates(24, 25); } + { jjCheckNAddTwoStates(20, 21); } break; case 0: if ((0x3ff000000000000L & l) != 0L) @@ -887,10 +887,10 @@ static private int jjMoveNfa_0(int startState, int curPos) if (kind > 1) kind = 1; } - else if (curChar == 35) - { jjCheckNAddTwoStates(20, 21); } else if (curChar == 34) - jjstateSet[jjnewStateCnt++] = 16; + { jjCheckNAddStates(4, 7); } + else if (curChar == 35) + { jjCheckNAddTwoStates(16, 17); } else if (curChar == 46) { jjCheckNAdd(11); } else if (curChar == 47) @@ -912,14 +912,14 @@ static private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 2) kind = 2; - { jjCheckNAddStates(4, 6); } + { jjCheckNAddStates(8, 10); } break; case 2: if ((0xffffffffffffdbffL & l) == 0L) break; if (kind > 2) kind = 2; - { jjCheckNAddStates(4, 6); } + { jjCheckNAddStates(8, 10); } break; case 3: if ((0x2400L & l) != 0L && kind > 2) @@ -978,50 +978,61 @@ static private int jjMoveNfa_0(int startState, int curPos) { jjCheckNAdd(14); } break; case 15: - if (curChar == 34) - jjstateSet[jjnewStateCnt++] = 16; - break; - case 17: - if ((0x3ff000000000000L & l) != 0L) - { jjAddStates(7, 8); } - break; - case 18: - if (curChar == 34 && kind > 89) - kind = 89; - break; - case 19: if (curChar == 35) - { jjCheckNAddTwoStates(20, 21); } + { jjCheckNAddTwoStates(16, 17); } break; - case 20: + case 16: if ((0xfffffff7ffffffffL & l) != 0L) - { jjCheckNAddTwoStates(20, 21); } + { jjCheckNAddTwoStates(16, 17); } break; - case 21: - if (curChar == 35 && kind > 90) - kind = 90; + case 17: + if (curChar == 35 && kind > 91) + kind = 91; break; - case 22: + case 18: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 86) kind = 86; { jjCheckNAddStates(0, 3); } break; - case 24: + case 20: if ((0x3ff000000000000L & l) != 0L) - { jjCheckNAddTwoStates(24, 25); } + { jjCheckNAddTwoStates(20, 21); } break; - case 25: + case 21: if (curChar == 39 && kind > 87) kind = 87; break; - case 26: + case 22: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 88) kind = 88; - { jjCheckNAdd(26); } + { jjCheckNAdd(22); } + break; + case 23: + if (curChar == 34) + { jjCheckNAddStates(4, 7); } + break; + case 25: + if ((0x3ff000000000000L & l) != 0L) + { jjAddStates(11, 12); } + break; + case 26: + if (curChar == 34 && kind > 89) + kind = 89; + break; + case 28: + { jjCheckNAddStates(13, 15); } + break; + case 29: + if ((0xfffffffbffffffffL & l) != 0L) + { jjCheckNAddStates(13, 15); } + break; + case 30: + if (curChar == 34 && kind > 90) + kind = 90; break; default : break; } @@ -1034,50 +1045,61 @@ static private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 27: + case 31: if ((0x7fffffe87fffffeL & l) != 0L) { if (kind > 88) kind = 88; - { jjCheckNAdd(26); } + { jjCheckNAdd(22); } } if ((0x7fffffe87fffffeL & l) != 0L) - { jjCheckNAddTwoStates(24, 25); } + { jjCheckNAddTwoStates(20, 21); } break; case 0: if ((0x7fffffe87fffffeL & l) == 0L) break; if (kind > 88) kind = 88; - { jjCheckNAddStates(9, 11); } + { jjCheckNAddStates(16, 18); } break; case 2: if (kind > 2) kind = 2; - { jjAddStates(4, 6); } + { jjAddStates(8, 10); } break; case 12: if ((0x2000000020L & l) != 0L) - { jjAddStates(12, 13); } + { jjAddStates(19, 20); } break; case 16: - case 17: - if ((0x7fffffe87fffffeL & l) != 0L) - { jjCheckNAddTwoStates(17, 18); } + { jjAddStates(21, 22); } break; case 20: - { jjAddStates(14, 15); } - break; - case 24: if ((0x7fffffe87fffffeL & l) != 0L) - { jjCheckNAddTwoStates(24, 25); } + { jjCheckNAddTwoStates(20, 21); } break; - case 26: + case 22: if ((0x7fffffe87fffffeL & l) == 0L) break; if (kind > 88) kind = 88; - { jjCheckNAdd(26); } + { jjCheckNAdd(22); } + break; + case 24: + case 25: + if ((0x7fffffe87fffffeL & l) != 0L) + { jjCheckNAddTwoStates(25, 26); } + break; + case 27: + if (curChar == 92) + jjstateSet[jjnewStateCnt++] = 28; + break; + case 28: + { jjCheckNAddStates(13, 15); } + break; + case 29: + if ((0xffffffffefffffffL & l) != 0L) + { jjCheckNAddStates(13, 15); } break; default : break; } @@ -1099,11 +1121,16 @@ static private int jjMoveNfa_0(int startState, int curPos) break; if (kind > 2) kind = 2; - { jjAddStates(4, 6); } + { jjAddStates(8, 10); } break; - case 20: + case 16: + if (jjCanMove_0(hiByte, i1, i2, l1, l2)) + { jjAddStates(21, 22); } + break; + case 28: + case 29: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - { jjAddStates(14, 15); } + { jjCheckNAddStates(13, 15); } break; default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break; } @@ -1116,14 +1143,15 @@ static private int jjMoveNfa_0(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 27 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 31 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } } } static final int[] jjnextStates = { - 10, 11, 12, 22, 2, 3, 5, 17, 18, 24, 25, 26, 13, 14, 20, 21, + 10, 11, 12, 18, 24, 27, 29, 30, 2, 3, 5, 25, 26, 27, 29, 30, + 20, 21, 22, 13, 14, 16, 17, }; private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) { @@ -1156,7 +1184,7 @@ public static final String[] jjstrLiteralImages = { "\174", "\75\76", "\74\75\76", "\55\76", "\72", "\73", "\54", "\56\56", "\50", "\51", "\133", "\135", "\133\133", "\135\135", "\173", "\175", "\75", "\41\75", "\74", "\76", "\74\74", "\76\76", "\74\75", "\76\75", "\53", "\55", "\52", "\57", "\47", "\74\55", -"\77", null, null, null, null, null, null, null, }; +"\77", null, null, null, null, null, null, null, null, }; static protected Token jjFillToken() { final Token t; @@ -1214,9 +1242,9 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); - if (jjmatchedPos == 0 && jjmatchedKind > 91) + if (jjmatchedPos == 0 && jjmatchedKind > 92) { - jjmatchedKind = 91; + jjmatchedKind = 92; } if (jjmatchedKind != 0x7fffffff) { @@ -1322,7 +1350,7 @@ static private void jjCheckNAddStates(int start, int end) { int i; jjround = 0x80000001; - for (i = 27; i-- > 0;) + for (i = 31; i-- > 0;) jjrounds[i] = 0x80000000; } @@ -1347,7 +1375,7 @@ public static final String[] lexStateNames = { "DEFAULT", }; static final long[] jjtoToken = { - 0xfffffffffffffff9L, 0xfffffffL, + 0xfffffffffffffff9L, 0x1fffffffL, }; static final long[] jjtoSkip = { 0x6L, 0x0L, @@ -1357,8 +1385,8 @@ static final long[] jjtoSpecial = { }; static protected SimpleCharStream input_stream; - static private final int[] jjrounds = new int[27]; - static private final int[] jjstateSet = new int[2 * 27]; + static private final int[] jjrounds = new int[31]; + static private final int[] jjstateSet = new int[2 * 31]; static protected char curChar;