diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java index 866f0b06..aa911945 100644 --- a/prism/src/parser/PrismParser.java +++ b/prism/src/parser/PrismParser.java @@ -3506,6 +3506,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[97] = 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; @@ -3526,7 +3554,7 @@ ident="max"; break; } default: - jj_la1[97] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3563,7 +3591,7 @@ int EqNeq() throws ParseException { break; } default: - jj_la1[98] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3595,7 +3623,7 @@ int LtGt() throws ParseException { break; } default: - jj_la1[99] = jj_gen; + jj_la1[100] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3621,7 +3649,7 @@ begin = getToken(1); break; } default: - jj_la1[100] = jj_gen; + jj_la1[101] = jj_gen; ; } jj_consume_token(0); @@ -3778,19 +3806,6 @@ fl.setLHS(s); finally { jj_save(17, xla); } } - static private boolean jj_3R_187() - { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_41()) return true; - return false; - } - - static private boolean jj_3R_165() - { - if (jj_scan_token(MIN)) return true; - return false; - } - static private boolean jj_3R_82() { if (jj_scan_token(LPARENTH)) return true; @@ -4976,6 +4991,24 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_57() + { + if (jj_scan_token(LE)) return true; + return false; + } + + static private boolean jj_3R_56() + { + if (jj_scan_token(GE)) return true; + return false; + } + + static private boolean jj_3R_55() + { + if (jj_scan_token(LT)) return true; + return false; + } + static private boolean jj_3R_36() { if (jj_scan_token(S)) return true; @@ -4993,6 +5026,29 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_54() + { + if (jj_scan_token(GT)) return true; + return false; + } + + static private boolean jj_3R_48() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_54()) { + jj_scanpos = xsp; + if (jj_3R_55()) { + jj_scanpos = xsp; + if (jj_3R_56()) { + jj_scanpos = xsp; + if (jj_3R_57()) return true; + } + } + } + return false; + } + static private boolean jj_3R_37() { if (jj_3R_43()) return true; @@ -5058,6 +5114,29 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_122() + { + if (jj_scan_token(NE)) return true; + return false; + } + + static private boolean jj_3R_118() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_121()) { + jj_scanpos = xsp; + if (jj_3R_122()) return true; + } + return false; + } + + static private boolean jj_3R_121() + { + if (jj_scan_token(EQ)) return true; + return false; + } + static private boolean jj_3R_171() { if (jj_3R_50()) return true; @@ -5103,30 +5182,12 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_57() - { - if (jj_scan_token(LE)) return true; - return false; - } - static private boolean jj_3R_97() { if (jj_3R_35()) return true; return false; } - static private boolean jj_3R_56() - { - if (jj_scan_token(GE)) return true; - return false; - } - - static private boolean jj_3R_55() - { - if (jj_scan_token(LT)) return true; - return false; - } - static private boolean jj_3R_60() { if (jj_scan_token(LBRACE)) return true; @@ -5140,29 +5201,6 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_54() - { - if (jj_scan_token(GT)) return true; - return false; - } - - static private boolean jj_3R_48() - { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_54()) { - jj_scanpos = xsp; - if (jj_3R_55()) { - jj_scanpos = xsp; - if (jj_3R_56()) { - jj_scanpos = xsp; - if (jj_3R_57()) return true; - } - } - } - return false; - } - static private boolean jj_3R_92() { if (jj_scan_token(EQ)) return true; @@ -5241,6 +5279,12 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_51() + { + if (jj_scan_token(REG_IDENTPRIME)) return true; + return false; + } + static private boolean jj_3R_79() { Token xsp; @@ -5264,29 +5308,6 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_122() - { - if (jj_scan_token(NE)) return true; - return false; - } - - static private boolean jj_3R_118() - { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_121()) { - jj_scanpos = xsp; - if (jj_3R_122()) return true; - } - return false; - } - - static private boolean jj_3R_121() - { - if (jj_scan_token(EQ)) return true; - return false; - } - static private boolean jj_3R_64() { if (jj_3R_78()) return true; @@ -5349,12 +5370,6 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_51() - { - if (jj_scan_token(REG_IDENTPRIME)) return true; - return false; - } - static private boolean jj_3R_193() { if (jj_scan_token(MAX)) return true; @@ -5594,6 +5609,19 @@ fl.setLHS(s); return false; } + static private boolean jj_3R_187() + { + if (jj_scan_token(COMMA)) return true; + if (jj_3R_41()) return true; + return false; + } + + static private boolean jj_3R_165() + { + if (jj_scan_token(MIN)) return true; + return false; + } + static private boolean jj_initialized_once = false; /** Generated Token Manager. */ static public PrismParserTokenManager token_source; @@ -5606,7 +5634,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[101]; + static final private int[] jj_la1 = new int[102]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -5618,16 +5646,16 @@ fl.setLHS(s); jj_la1_init_3(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0xa28804c0,0xa08804c0,0x2000000,0x60340848,0x0,0x60340848,0x60340848,0x0,0x60340848,0x400,0x80000000,0x80,0x80000480,0x10000210,0x10000210,0x0,0x40,0x0,0x2000000,0x10000030,0x0,0x4000000,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1400000,0x0,0x41740808,0x41740808,0x41740808,0x41740808,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x40340808,0x0,0x40000000,0x40000000,0x0,0x40000,0x0,0x40000000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x41740808,0x41740808,0x0,0x0,0x49740908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x40000000,0x0,0x0,0x0,}; + jj_la1_0 = new int[] {0xa28804c0,0xa08804c0,0x2000000,0x60340848,0x0,0x60340848,0x60340848,0x0,0x60340848,0x400,0x80000000,0x80,0x80000480,0x10000210,0x10000210,0x0,0x40,0x0,0x2000000,0x10000030,0x0,0x4000000,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1400000,0x0,0x41740808,0x41740808,0x41740808,0x41740808,0x41740808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x0,0x0,0x0,0x0,0x0,0x0,0x40340808,0x40340808,0x0,0x40000000,0x40000000,0x0,0x40000,0x0,0x40000000,0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x41740808,0x41740808,0x0,0x0,0x49740908,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000000,0x0,0x0,0x40000000,0x0,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x30fe3a,0x107e08,0x208032,0x24f51c1,0x0,0x24f51c1,0x24f51c1,0x0,0x24f51c1,0x800,0x8,0x100000,0x102e08,0x0,0x0,0x5000,0x5000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x24f01c5,0x4000000,0x400000,0x0,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1840000,0x0,0x1840000,0x4,0x0,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x0,0x0,0x10000000,0x20000000,0x8000000,0x4000000,0x24f01c1,0x0,0x0,0x0,0x0,0x0,0x0,0x4f01c1,0x4f01c1,0x0,0x1,0x1,0x0,0x400000,0x0,0x1,0x1c0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x1,0x70000,0x0,0x24f01c5,0x24f01c5,0x0,0x80000,0x24f01c5,0x0,0x701c0,0x701c0,0x0,0x0,0x0,0x0,0xc000001,0x0,0x1,0x0,0x0,0x80000000,}; + jj_la1_1 = new int[] {0x30fe3a,0x107e08,0x208032,0x24f51c1,0x0,0x24f51c1,0x24f51c1,0x0,0x24f51c1,0x800,0x8,0x100000,0x102e08,0x0,0x0,0x5000,0x5000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x24f01c5,0x4000000,0x400000,0x0,0x24f01c5,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1840000,0x0,0x1840000,0x4,0x0,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x24f01c5,0x0,0x0,0x10000000,0x20000000,0x8000000,0x4000000,0x24f01c1,0x0,0x0,0x0,0x0,0x0,0x0,0x4f01c1,0x4f01c1,0x0,0x1,0x1,0x0,0x400000,0x0,0x1,0x1c0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x1,0x70000,0x0,0x24f01c5,0x24f01c5,0x0,0x80000,0x24f01c5,0x0,0x701c0,0x701c0,0x0,0x0,0x0,0x0,0xc000001,0x0,0x0,0x1,0x0,0x0,0x80000000,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x0,0x6c108088,0x1,0x6c108088,0x6c108088,0x1,0x6c108088,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20,0x20000000,0x0,0x20,0x20000000,0x80000,0x6c108088,0x0,0x8,0x2,0x6c1080a8,0x20000000,0x20,0x2,0x2,0x400200,0x2,0x2,0x400200,0x60000008,0x0,0x66820,0x0,0x0,0x66820,0x6c108088,0x6c108088,0x6c108088,0x6c108088,0x6c108088,0x66820,0x2000000,0x0,0x0,0x0,0x0,0x6c108088,0x1800,0x66000,0x180000,0x180000,0x600000,0x600000,0x6c108088,0x6c008088,0x8,0x0,0x20000000,0x2,0xc000000,0x8,0x66800,0x0,0x200,0x200,0x0,0x8,0x66808,0x200,0x8,0x200,0x66800,0x0,0x200,0x6c108088,0x6c108088,0x400000,0x0,0x6c108088,0x8080,0x0,0x8,0x2,0x24000000,0x200000,0x24000000,0x20080000,0x2,0x20000000,0x1800,0x66000,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x0,0x6c108088,0x1,0x6c108088,0x6c108088,0x1,0x6c108088,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20,0x20000000,0x0,0x20,0x20000000,0x80000,0x6c108088,0x0,0x8,0x2,0x6c1080a8,0x20000000,0x20,0x2,0x2,0x400200,0x2,0x2,0x400200,0x60000008,0x0,0x66820,0x0,0x0,0x66820,0x6c108088,0x6c108088,0x6c108088,0x6c108088,0x6c108088,0x66820,0x2000000,0x0,0x0,0x0,0x0,0x6c108088,0x1800,0x66000,0x180000,0x180000,0x600000,0x600000,0x6c108088,0x6c008088,0x8,0x0,0x20000000,0x2,0xc000000,0x8,0x66800,0x0,0x200,0x200,0x0,0x8,0x66808,0x200,0x8,0x200,0x66800,0x0,0x200,0x6c108088,0x6c108088,0x400000,0x0,0x6c108088,0x8080,0x0,0x8,0x2,0x24000000,0x200000,0x24000000,0x20080000,0x2,0xc0000000,0x20000000,0x1800,0x66000,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[18]; static private boolean jj_rescan = false; @@ -5651,7 +5679,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 101; i++) jj_la1[i] = -1; + for (int i = 0; i < 102; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5666,7 +5694,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 101; i++) jj_la1[i] = -1; + for (int i = 0; i < 102; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5684,7 +5712,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 101; i++) jj_la1[i] = -1; + for (int i = 0; i < 102; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5695,7 +5723,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 101; i++) jj_la1[i] = -1; + for (int i = 0; i < 102; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5712,7 +5740,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 101; i++) jj_la1[i] = -1; + for (int i = 0; i < 102; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5722,7 +5750,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 101; i++) jj_la1[i] = -1; + for (int i = 0; i < 102; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -5848,12 +5876,12 @@ fl.setLHS(s); /** Generate ParseException. */ static public ParseException generateParseException() { jj_expentries.clear(); - boolean[] la1tokens = new boolean[97]; + boolean[] la1tokens = new boolean[98]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 101; i++) { + for (int i = 0; i < 102; 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 77fb198b..fec19d04 100644 --- a/prism/src/parser/PrismParserTokenManager.java +++ b/prism/src/parser/PrismParserTokenManager.java @@ -27,10 +27,10 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac if ((active0 & 0x70fe3bf6bff6f0L) != 0L) { jjmatchedKind = 93; - return 27; + return 31; } if ((active0 & 0x18f01c409400908L) != 0L) - return 27; + return 31; if ((active1 & 0x400000L) != 0L) return 1; if ((active1 & 0x4L) != 0L) @@ -44,22 +44,22 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac jjmatchedKind = 93; jjmatchedPos = 1; } - return 27; + return 31; } return -1; case 2: if ((active0 & 0x2001d0000000L) != 0L) - return 27; + return 31; if ((active0 & 0x73defa26bff6f0L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 2; - return 27; + return 31; } return -1; case 3: if ((active0 & 0x4358c002200490L) != 0L) - return 27; + return 31; if ((active0 & 0x30863a249ff260L) != 0L) { if (jjmatchedPos != 3) @@ -67,7 +67,7 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac jjmatchedKind = 93; jjmatchedPos = 3; } - return 27; + return 31; } return -1; case 4: @@ -75,52 +75,52 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac { jjmatchedKind = 93; jjmatchedPos = 4; - return 27; + return 31; } if ((active0 & 0x60020040060L) != 0L) - return 27; + return 31; return -1; case 5: if ((active0 & 0x20000200900200L) != 0L) - return 27; + return 31; if ((active0 & 0x108838040bf000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 5; - return 27; + return 31; } return -1; case 6: - if ((active0 & 0x800000081000L) != 0L) - return 27; if ((active0 & 0x1008380403e000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 6; - return 27; + return 31; } + if ((active0 & 0x800000081000L) != 0L) + return 31; return -1; case 7: if ((active0 & 0x1008380403e000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 7; - return 27; + return 31; } return -1; case 8: if ((active0 & 0x4024000L) != 0L) - return 27; + return 31; if ((active0 & 0x1008380001a000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 8; - return 27; + return 31; } return -1; case 9: if ((active0 & 0x10003000010000L) != 0L) - return 27; + return 31; if ((active0 & 0x8080000a000L) != 0L) { if (jjmatchedPos != 9) @@ -128,55 +128,55 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac jjmatchedKind = 93; jjmatchedPos = 9; } - return 27; + return 31; } return -1; case 10: + if ((active0 & 0x2000000000L) != 0L) + return 31; if ((active0 & 0x8080000a000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 10; - return 27; + return 31; } - if ((active0 & 0x2000000000L) != 0L) - return 27; return -1; case 11: + if ((active0 & 0x2000L) != 0L) + return 31; if ((active0 & 0x80800008000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 11; - return 27; + return 31; } - if ((active0 & 0x2000L) != 0L) - return 27; return -1; case 12: + if ((active0 & 0x80000000000L) != 0L) + return 31; if ((active0 & 0x800008000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 12; - return 27; + return 31; } - if ((active0 & 0x80000000000L) != 0L) - return 27; return -1; case 13: + if ((active0 & 0x8000L) != 0L) + return 31; if ((active0 & 0x800000000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 13; - return 27; + return 31; } - if ((active0 & 0x8000L) != 0L) - return 27; return -1; case 14: if ((active0 & 0x800000000L) != 0L) { jjmatchedKind = 93; jjmatchedPos = 14; - return 27; + return 31; } return -1; default : @@ -235,17 +235,17 @@ static private int jjMoveStringLiteralDfa0_0(){ case 63: return jjStopAtPos(0, 89); 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, 22, 27); + return jjStartNfaWithStates_0(0, 22, 31); case 71: - return jjStartNfaWithStates_0(0, 24, 27); + return jjStartNfaWithStates_0(0, 24, 31); case 73: - return jjStartNfaWithStates_0(0, 27, 27); + return jjStartNfaWithStates_0(0, 27, 31); case 80: jjmatchedKind = 40; return jjMoveStringLiteralDfa1_0(0xc000000000L, 0x0L); @@ -253,13 +253,13 @@ static private int jjMoveStringLiteralDfa0_0(){ jjmatchedKind = 50; return jjMoveStringLiteralDfa1_0(0x3000000000000L, 0x0L); case 83: - return jjStartNfaWithStates_0(0, 51, 27); + return jjStartNfaWithStates_0(0, 51, 31); case 85: - return jjStartNfaWithStates_0(0, 55, 27); + return jjStartNfaWithStates_0(0, 55, 31); case 87: - return jjStartNfaWithStates_0(0, 56, 27); + return jjStartNfaWithStates_0(0, 56, 31); case 88: - return jjStartNfaWithStates_0(0, 34, 27); + return jjStartNfaWithStates_0(0, 34, 31); case 91: jjmatchedKind = 69; return jjMoveStringLiteralDfa1_0(0x0L, 0x80L); @@ -400,7 +400,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, break; case 97: if ((active0 & 0x200000000000L) != 0L) - return jjStartNfaWithStates_0(2, 45, 27); + return jjStartNfaWithStates_0(2, 45, 31); return jjMoveStringLiteralDfa3_0(active0, 0x1004000000000L); case 98: return jjMoveStringLiteralDfa3_0(active0, 0x20000000L); @@ -414,13 +414,13 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, return jjMoveStringLiteralDfa3_0(active0, 0x20000000480L); case 110: if ((active0 & 0x100000000L) != 0L) - return jjStartNfaWithStates_0(2, 32, 27); + return jjStartNfaWithStates_0(2, 32, 31); return jjMoveStringLiteralDfa3_0(active0, 0x800200040L); case 111: return jjMoveStringLiteralDfa3_0(active0, 0x10180000800030L); case 112: if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(2, 31, 27); + return jjStartNfaWithStates_0(2, 31, 31); return jjMoveStringLiteralDfa3_0(active0, 0x40000000000L); case 114: return jjMoveStringLiteralDfa3_0(active0, 0x80000L); @@ -428,7 +428,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, return jjMoveStringLiteralDfa3_0(active0, 0x20003000000000L); case 116: if ((active0 & 0x10000000L) != 0L) - return jjStartNfaWithStates_0(2, 28, 27); + return jjStartNfaWithStates_0(2, 28, 31); return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L); case 117: return jjMoveStringLiteralDfa3_0(active0, 0x40000000000200L); @@ -438,7 +438,7 @@ static private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L); case 120: if ((active0 & 0x40000000L) != 0L) - return jjStartNfaWithStates_0(2, 30, 27); + return jjStartNfaWithStates_0(2, 30, 31); break; default : break; @@ -466,33 +466,33 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0){ return jjMoveStringLiteralDfa4_0(active0, 0x80000800200L); 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 & 0x200000L) != 0L) - return jjStartNfaWithStates_0(3, 21, 27); + return jjStartNfaWithStates_0(3, 21, 31); return jjMoveStringLiteralDfa4_0(active0, 0x10000000000020L); case 100: return jjMoveStringLiteralDfa4_0(active0, 0x20800000000L); case 101: if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_0(3, 46, 27); + return jjStartNfaWithStates_0(3, 46, 31); else if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 54, 27); + return jjStartNfaWithStates_0(3, 54, 31); return jjMoveStringLiteralDfa4_0(active0, 0x3020000000L); 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, 0x84000L); case 110: if ((active0 & 0x8000000000L) != 0L) - return jjStartNfaWithStates_0(3, 39, 27); + return jjStartNfaWithStates_0(3, 39, 31); else if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 49, 27); + return jjStartNfaWithStates_0(3, 49, 31); break; case 111: return jjMoveStringLiteralDfa4_0(active0, 0x8000L); @@ -502,15 +502,15 @@ static private int jjMoveStringLiteralDfa3_0(long old0, long active0){ return jjMoveStringLiteralDfa4_0(active0, 0x60040L); case 116: if ((active0 & 0x2000000L) != 0L) - return jjStartNfaWithStates_0(3, 25, 27); + return jjStartNfaWithStates_0(3, 25, 31); return jjMoveStringLiteralDfa4_0(active0, 0x20040000100000L); case 117: return jjMoveStringLiteralDfa4_0(active0, 0x200000000L); case 120: if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_0(3, 38, 27); + return jjStartNfaWithStates_0(3, 38, 31); else if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 48, 27); + return jjStartNfaWithStates_0(3, 48, 31); break; default : break; @@ -529,23 +529,23 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){ { case 97: if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_0(4, 42, 27); + return jjStartNfaWithStates_0(4, 42, 31); return jjMoveStringLiteralDfa5_0(active0, 0x80000800000L); case 98: return jjMoveStringLiteralDfa5_0(active0, 0x8000L); case 101: if ((active0 & 0x40000L) != 0L) - return jjStartNfaWithStates_0(4, 18, 27); + return jjStartNfaWithStates_0(4, 18, 31); return jjMoveStringLiteralDfa5_0(active0, 0x20000800110000L); case 104: return jjMoveStringLiteralDfa5_0(active0, 0x10000000000000L); case 107: if ((active0 & 0x20L) != 0L) - return jjStartNfaWithStates_0(4, 5, 27); + return jjStartNfaWithStates_0(4, 5, 31); break; case 108: if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_0(4, 29, 27); + return jjStartNfaWithStates_0(4, 29, 31); return jjMoveStringLiteralDfa5_0(active0, 0x200000200L); case 110: return jjMoveStringLiteralDfa5_0(active0, 0x3000L); @@ -553,13 +553,13 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){ return jjMoveStringLiteralDfa5_0(active0, 0x4000L); case 112: if ((active0 & 0x20000000000L) != 0L) - return jjStartNfaWithStates_0(4, 41, 27); + return jjStartNfaWithStates_0(4, 41, 31); break; case 114: return jjMoveStringLiteralDfa5_0(active0, 0x803004000000L); 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, 0x80000L); @@ -588,23 +588,23 @@ static private int jjMoveStringLiteralDfa5_0(long old0, long active0){ return jjMoveStringLiteralDfa6_0(active0, 0x800000004000L); case 101: if ((active0 & 0x200L) != 0L) - return jjStartNfaWithStates_0(5, 9, 27); + return jjStartNfaWithStates_0(5, 9, 31); else if ((active0 & 0x200000000L) != 0L) - return jjStartNfaWithStates_0(5, 33, 27); + return jjStartNfaWithStates_0(5, 33, 31); break; case 105: return jjMoveStringLiteralDfa6_0(active0, 0x4001000L); case 108: if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_0(5, 23, 27); + return jjStartNfaWithStates_0(5, 23, 31); return jjMoveStringLiteralDfa6_0(active0, 0x80000L); case 109: if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 53, 27); + return jjStartNfaWithStates_0(5, 53, 31); break; case 114: if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_0(5, 20, 27); + return jjStartNfaWithStates_0(5, 20, 31); break; case 115: return jjMoveStringLiteralDfa6_0(active0, 0x28000L); @@ -631,7 +631,7 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){ { case 97: if ((active0 & 0x80000L) != 0L) - return jjStartNfaWithStates_0(6, 19, 27); + return jjStartNfaWithStates_0(6, 19, 31); return jjMoveStringLiteralDfa7_0(active0, 0x3004012000L); case 101: return jjMoveStringLiteralDfa7_0(active0, 0x800008000L); @@ -639,11 +639,11 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){ return jjMoveStringLiteralDfa7_0(active0, 0x80000000000L); case 115: if ((active0 & 0x800000000000L) != 0L) - return jjStartNfaWithStates_0(6, 47, 27); + return jjStartNfaWithStates_0(6, 47, 31); return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L); case 116: if ((active0 & 0x1000L) != 0L) - return jjStartNfaWithStates_0(6, 12, 27); + return jjStartNfaWithStates_0(6, 12, 31); return jjMoveStringLiteralDfa7_0(active0, 0x20000L); case 117: return jjMoveStringLiteralDfa7_0(active0, 0x4000L); @@ -693,7 +693,7 @@ static private int jjMoveStringLiteralDfa8_0(long old0, long active0){ return jjMoveStringLiteralDfa9_0(active0, 0x10000L); 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, 0x10080000002000L); @@ -701,11 +701,11 @@ static private int jjMoveStringLiteralDfa8_0(long old0, long active0){ return jjMoveStringLiteralDfa9_0(active0, 0x3000000000L); case 109: if ((active0 & 0x20000L) != 0L) - return jjStartNfaWithStates_0(8, 17, 27); + return jjStartNfaWithStates_0(8, 17, 31); return jjMoveStringLiteralDfa9_0(active0, 0x800000000L); case 116: if ((active0 & 0x4000000L) != 0L) - return jjStartNfaWithStates_0(8, 26, 27); + return jjStartNfaWithStates_0(8, 26, 31); break; case 118: return jjMoveStringLiteralDfa9_0(active0, 0x8000L); @@ -728,7 +728,7 @@ static private int jjMoveStringLiteralDfa9_0(long old0, long active0){ return jjMoveStringLiteralDfa10_0(active0, 0xa000L); case 99: if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_0(9, 52, 27); + return jjStartNfaWithStates_0(9, 52, 31); break; case 101: if ((active0 & 0x1000000000L) != 0L) @@ -741,7 +741,7 @@ static private int jjMoveStringLiteralDfa9_0(long old0, long active0){ return jjMoveStringLiteralDfa10_0(active0, 0x800000000L); case 115: if ((active0 & 0x10000L) != 0L) - return jjStartNfaWithStates_0(9, 16, 27); + return jjStartNfaWithStates_0(9, 16, 31); return jjMoveStringLiteralDfa10_0(active0, 0x80000000000L); default : break; @@ -764,7 +764,7 @@ static private int jjMoveStringLiteralDfa10_0(long old0, long active0){ return jjMoveStringLiteralDfa11_0(active0, 0x800002000L); case 115: if ((active0 & 0x2000000000L) != 0L) - return jjStartNfaWithStates_0(10, 37, 27); + return jjStartNfaWithStates_0(10, 37, 31); break; case 116: return jjMoveStringLiteralDfa11_0(active0, 0x80000000000L); @@ -789,7 +789,7 @@ static private int jjMoveStringLiteralDfa11_0(long old0, long active0){ return jjMoveStringLiteralDfa12_0(active0, 0x8000L); case 116: if ((active0 & 0x2000L) != 0L) - return jjStartNfaWithStates_0(11, 13, 27); + return jjStartNfaWithStates_0(11, 13, 31); break; default : break; @@ -808,7 +808,7 @@ static private int jjMoveStringLiteralDfa12_0(long old0, long active0){ { case 99: if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_0(12, 43, 27); + return jjStartNfaWithStates_0(12, 43, 31); break; case 101: return jjMoveStringLiteralDfa13_0(active0, 0x8000L); @@ -831,7 +831,7 @@ static private int jjMoveStringLiteralDfa13_0(long old0, long active0){ { case 115: if ((active0 & 0x8000L) != 0L) - return jjStartNfaWithStates_0(13, 15, 27); + return jjStartNfaWithStates_0(13, 15, 31); break; case 116: return jjMoveStringLiteralDfa14_0(active0, 0x800000000L); @@ -869,7 +869,7 @@ static private int jjMoveStringLiteralDfa15_0(long old0, long active0){ { case 99: if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_0(15, 35, 27); + return jjStartNfaWithStates_0(15, 35, 31); break; default : break; @@ -893,7 +893,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; @@ -908,12 +908,12 @@ static private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 27: + case 31: if ((0x3ff000000000000L & l) != 0L) { if (kind > 93) kind = 93; - { jjCheckNAdd(26); } + { jjCheckNAdd(22); } } else if (curChar == 39) { @@ -921,7 +921,7 @@ static private int jjMoveNfa_0(int startState, int curPos) kind = 92; } if ((0x3ff000000000000L & l) != 0L) - { jjCheckNAddTwoStates(24, 25); } + { jjCheckNAddTwoStates(20, 21); } break; case 0: if ((0x3ff000000000000L & l) != 0L) @@ -935,10 +935,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) @@ -960,14 +960,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) @@ -1026,50 +1026,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 > 94) - kind = 94; - 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 > 95) - kind = 95; + case 17: + if (curChar == 35 && kind > 96) + kind = 96; break; - case 22: + case 18: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 91) kind = 91; { 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 > 92) kind = 92; break; - case 26: + case 22: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 93) kind = 93; - { 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 > 94) + kind = 94; + break; + case 28: + { jjCheckNAddStates(13, 15); } + break; + case 29: + if ((0xfffffffbffffffffL & l) != 0L) + { jjCheckNAddStates(13, 15); } + break; + case 30: + if (curChar == 34 && kind > 95) + kind = 95; break; default : break; } @@ -1082,50 +1093,61 @@ static private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 27: + case 31: if ((0x7fffffe87fffffeL & l) != 0L) { if (kind > 93) kind = 93; - { jjCheckNAdd(26); } + { jjCheckNAdd(22); } } if ((0x7fffffe87fffffeL & l) != 0L) - { jjCheckNAddTwoStates(24, 25); } + { jjCheckNAddTwoStates(20, 21); } break; case 0: if ((0x7fffffe87fffffeL & l) == 0L) break; if (kind > 93) kind = 93; - { 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 > 93) kind = 93; - { 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; } @@ -1147,11 +1169,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; } @@ -1164,14 +1191,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) { @@ -1206,7 +1234,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; @@ -1264,9 +1292,9 @@ public static Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); - if (jjmatchedPos == 0 && jjmatchedKind > 96) + if (jjmatchedPos == 0 && jjmatchedKind > 97) { - jjmatchedKind = 96; + jjmatchedKind = 97; } if (jjmatchedKind != 0x7fffffff) { @@ -1373,7 +1401,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; } @@ -1399,7 +1427,7 @@ public static final String[] lexStateNames = { "DEFAULT", }; static final long[] jjtoToken = { - 0xfffffffffffffff9L, 0x1ffffffffL, + 0xfffffffffffffff9L, 0x3ffffffffL, }; static final long[] jjtoSkip = { 0x6L, 0x0L, @@ -1409,8 +1437,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 int curChar;