From badd6f924c6cb88c8760675be840ac99646ef117 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Fri, 12 Oct 2018 14:25:13 +0200 Subject: [PATCH] (HOA path) PrismParser: refactor double quoted identifiers (parser refresh) --- prism/src/parser/ParseException.java | 38 +- prism/src/parser/PrismParser.java | 1227 ++++++++--------- prism/src/parser/PrismParser.jj | 2 +- prism/src/parser/PrismParserConstants.java | 12 +- prism/src/parser/PrismParserTokenManager.java | 355 ++--- prism/src/parser/SimpleCharStream.java | 8 +- prism/src/parser/Token.java | 6 +- prism/src/parser/TokenMgrError.java | 23 +- 8 files changed, 842 insertions(+), 829 deletions(-) diff --git a/prism/src/parser/ParseException.java b/prism/src/parser/ParseException.java index 0f7f1628..3423946f 100644 --- a/prism/src/parser/ParseException.java +++ b/prism/src/parser/ParseException.java @@ -1,5 +1,5 @@ -/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 6.0 */ -/* JavaCCOptions:KEEP_LINE_COL=null */ +/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 6.1 */ +/* JavaCCOptions:KEEP_LINE_COLUMN=true */ package parser; /** @@ -20,6 +20,11 @@ public class ParseException extends Exception { */ private static final long serialVersionUID = 1L; + /** + * The end of line string for this machine. + */ + protected static String EOL = System.getProperty("line.separator", "\n"); + /** * This constructor is used by the method "generateParseException" * in the generated parser. Calling this constructor generates @@ -88,7 +93,7 @@ public class ParseException extends Exception { private static String initialise(Token currentToken, int[][] expectedTokenSequences, String[] tokenImage) { - String eol = System.getProperty("line.separator", "\n"); + StringBuffer expected = new StringBuffer(); int maxSize = 0; for (int i = 0; i < expectedTokenSequences.length; i++) { @@ -101,7 +106,7 @@ public class ParseException extends Exception { if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) { expected.append("..."); } - expected.append(eol).append(" "); + expected.append(EOL).append(" "); } String retval = "Encountered \""; Token tok = currentToken.next; @@ -118,20 +123,23 @@ public class ParseException extends Exception { tok = tok.next; } retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn; - retval += "." + eol; - if (expectedTokenSequences.length == 1) { - retval += "Was expecting:" + eol + " "; + retval += "." + EOL; + + + if (expectedTokenSequences.length == 0) { + // Nothing to add here } else { - retval += "Was expecting one of:" + eol + " "; + if (expectedTokenSequences.length == 1) { + retval += "Was expecting:" + EOL + " "; + } else { + retval += "Was expecting one of:" + EOL + " "; + } + retval += expected.toString(); } - retval += expected.toString(); + return retval; } - /** - * The end of line string for this machine. - */ - protected String eol = System.getProperty("line.separator", "\n"); /** * Used to convert raw characters to their escaped version @@ -144,8 +152,6 @@ public class ParseException extends Exception { for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) { - case 0 : - continue; case '\b': retval.append("\\b"); continue; @@ -184,4 +190,4 @@ public class ParseException extends Exception { } } -/* JavaCC - OriginalChecksum=83512206aea6c09dd76f640dc4cc775b (do not edit this line) */ +/* JavaCC - OriginalChecksum=5d514a10ec1a5281db2efa75a40150c0 (do not edit this line) */ diff --git a/prism/src/parser/PrismParser.java b/prism/src/parser/PrismParser.java index 64357ac2..866f0b06 100644 --- a/prism/src/parser/PrismParser.java +++ b/prism/src/parser/PrismParser.java @@ -25,7 +25,7 @@ public class PrismParser implements PrismParserConstants { static { keywordList.clear(); for (int i = PrismParserConstants.COMMENT+1; i < PrismParserConstants.NOT; i++) { - keywordList.add(PrismParserConstants.tokenImage[i].replaceAll("\u005c"", "")); + keywordList.add(PrismParserConstants.tokenImage[i].replaceAll("\"", "")); } } @@ -52,26 +52,26 @@ public class PrismParser implements PrismParserConstants { p = new PrismParser(); str = (args.length > 1) ? new FileInputStream(args[1]) : System.in; src = (args.length > 1) ? "file "+args[1] : "stdin"; - System.out.println("Reading from "+src+"...\u005cn"); + System.out.println("Reading from "+src+"...\n"); if (args[0].equals("-modulesfile") || args[0].equals("-mf")) { ModulesFile mf = p.parseModulesFile(str); - System.out.print("Modules file:\u005cn=============\u005cn\u005cn" + mf); - System.out.print("\u005cnTree:\u005cn=====\u005cn" + mf.toTreeString()); + System.out.print("Modules file:\n=============\n\n" + mf); + System.out.print("\nTree:\n=====\n" + mf.toTreeString()); mf.tidyUp(); - System.out.print("\u005cnAnd after expansion:\u005cn====================\u005cn\u005cn" +mf); + System.out.print("\nAnd after expansion:\n====================\n\n" +mf); } else if (args[0].equals("-propertiesfile") || args[0].equals("-pf")) { PropertiesFile pf = p.parsePropertiesFile(new ModulesFile(), str); - System.out.print("Properties file:\u005cn================\u005cn\u005cn" + pf); - System.out.print("\u005cnTree:\u005cn=====\u005cn" + pf.toTreeString()); + System.out.print("Properties file:\n================\n\n" + pf); + System.out.print("\nTree:\n=====\n" + pf.toTreeString()); pf.tidyUp(); - System.out.print("\u005cnAnd after expansion:\u005cn====================\u005cn\u005cn" + pf); + System.out.print("\nAnd after expansion:\n====================\n\n" + pf); } else if (args[0].equals("-expression") || args[0].equals("-e")) { Expression expr = p.parseSingleExpression(str); System.out.println("Expression: " + expr.toString()); - System.out.print("Tree:\u005cn=====\u005cn" + expr.toTreeString()); + System.out.print("Tree:\n=====\n" + expr.toTreeString()); expr.typeCheck(); expr.semanticCheck(); System.out.println("Type: " + expr.getType().getTypeString()); @@ -86,7 +86,7 @@ public class PrismParser implements PrismParserConstants { } }); System.out.println("LTL formula: " + expr.toString()); - System.out.print("Tree:\u005cn=====\u005cn" + expr.toTreeString()); + System.out.print("Tree:\n=====\n" + expr.toTreeString()); expr.typeCheck(); //expr.semanticCheck(); System.out.println("Type: " + expr.getType().getTypeString()); @@ -247,29 +247,29 @@ public class PrismParser implements PrismParserConstants { Token t = firstToken; // extract any comment from the previous lines of the file - if (t.specialToken != null && !(t.specialToken.kind == PrismParserConstants.WHITESPACE && t.specialToken.image.matches("[\u005c\u005cn\u005c\u005cr]*"))) { + if (t.specialToken != null && !(t.specialToken.kind == PrismParserConstants.WHITESPACE && t.specialToken.image.matches("[\\n\\r]*"))) { // trace back thru special tokens that are comments t = t.specialToken; - while (t.specialToken != null && !(t.specialToken.kind == PrismParserConstants.WHITESPACE && t.specialToken.image.matches("[\u005c\u005cn\u005c\u005cr]*"))) + while (t.specialToken != null && !(t.specialToken.kind == PrismParserConstants.WHITESPACE && t.specialToken.image.matches("[\\n\\r]*"))) t = t.specialToken; // concatenate comment special tokens while (t != null) { s = t.image; // strip any nasty carriage returns - s = s.replaceAll("\u005cr", ""); + s = s.replaceAll("\r", ""); // remove "//" and preceding/subsequent spaces/tabs from comments if (t.kind == PrismParserConstants.COMMENT) { - while (comment.length() > 0 && (""+comment.charAt(comment.length()-1)).matches("[ \u005ct]")) + while (comment.length() > 0 && (""+comment.charAt(comment.length()-1)).matches("[ \t]")) comment = comment.substring(0,comment.length()-1); s = s.substring(2); - s = s.replaceFirst("[ \u005ct]*", ""); + s = s.replaceFirst("[ \t]*", ""); } comment += s; t = t.next; } } // remove final new line (if present) - if (comment.length() > 0 && (comment.charAt(comment.length()-1) == '\u005cn')) + if (comment.length() > 0 && (comment.charAt(comment.length()-1) == '\n')) comment = comment.substring(0,comment.length()-1); return comment; @@ -282,15 +282,15 @@ public class PrismParser implements PrismParserConstants { int i; String s, res = ""; // break into lines - while ((i = comment.indexOf("\u005cn")) != -1) { + while ((i = comment.indexOf("\n")) != -1) { s = comment.substring(0, i); comment = comment.substring(i+1); // add "//" to non-empty lines if (s.trim().length()>0) res += "// " + s; - res += "\u005cn"; + res += "\n"; } // deal with any trailing characters (with no new line ending them) - if (comment.trim().length()>0) res += "// " + comment + "\u005cn"; + if (comment.trim().length()>0) res += "// " + comment + "\n"; return res; } @@ -552,10 +552,10 @@ begin = getToken(1); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ ; break; } @@ -584,10 +584,10 @@ begin = getToken(1); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ prop = Property(); pf.addProperty(prop); label_3: @@ -659,10 +659,10 @@ begin = getToken(1); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ ; break; } @@ -691,10 +691,10 @@ begin = getToken(1); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ prop = Property(); label_5: while (true) { @@ -741,9 +741,7 @@ Property Property() throws ParseException {String name = null; Token begin = null; begin = getToken(1); if (jj_2_2(2147483647)) { - jj_consume_token(DQUOTE); - name = Identifier(); - jj_consume_token(DQUOTE); + name = QuotedIdentifier(); jj_consume_token(COLON); } else { ; @@ -879,9 +877,7 @@ void LabelDef(LabelList labelList) throws ParseException, PrismLangException {Ex Expression expr = null; if (jj_2_3(2147483647)) { jj_consume_token(LABEL); - jj_consume_token(DQUOTE); - name = IdentifierExpression(); - jj_consume_token(DQUOTE); + name = QuotedIdentifierExpression(); jj_consume_token(EQ); expr = Expression(false, false); jj_consume_token(SEMICOLON); @@ -1176,10 +1172,10 @@ updates.addUpdate(null, update); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ prob = Expression(false, false); jj_consume_token(COLON); update = Update(); @@ -1308,9 +1304,7 @@ RewardStruct RewardStruct() throws ParseException {String name = null, s = null; Token begin = null, begin2 = null; begin = jj_consume_token(REWARDS); if (jj_2_6(2147483647)) { - jj_consume_token(DQUOTE); - name = Identifier(); - jj_consume_token(DQUOTE); + name = QuotedIdentifier(); rs.setName(name); } else { ; @@ -1342,10 +1336,10 @@ rs.setName(name); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ ; break; } @@ -1432,9 +1426,7 @@ Observable Observable() throws ParseException {Token begin = null; Expression defn = null; begin = getToken(1); jj_consume_token(OBSERVABLE); - jj_consume_token(DQUOTE); - name = Identifier(); - jj_consume_token(DQUOTE); + name = QuotedIdentifier(); jj_consume_token(EQ); defn = Expression(false, false); jj_consume_token(SEMICOLON); @@ -1448,9 +1440,7 @@ void SystemEndsystem(ModulesFile mf) throws ParseException {String name = null; SystemDefn sysdef; jj_consume_token(SYSTEM); if (jj_2_7(2147483647)) { - jj_consume_token(DQUOTE); - name = Identifier(); - jj_consume_token(DQUOTE); + name = QuotedIdentifier(); } else { ; } @@ -1671,10 +1661,8 @@ begin = getToken(1); sys = new SystemModule(name); break; } - case DQUOTE:{ - jj_consume_token(DQUOTE); - name = Identifier(); - jj_consume_token(DQUOTE); + case REG_QUOTED_IDENT:{ + name = QuotedIdentifier(); sys = new SystemReference(name); break; } @@ -1855,10 +1843,10 @@ exprTemp.setOperand2(expr); exprTemp.setPosition(begin, getToken(0)); ret = expr case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ ret = ExpressionITE(prop, pathprop); break; } @@ -1905,10 +1893,10 @@ void TimeBound(ExpressionTemporal exprTemp) throws ParseException {Expression lB case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ uBound = Expression(false, false); break; } @@ -1950,10 +1938,10 @@ exprTemp.setUpperBound(uBound, false); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ uBound = Expression(false, false); break; } @@ -1995,10 +1983,10 @@ exprTemp.setUpperBound(uBound, true); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ lBound = Expression(false, false); break; } @@ -2040,10 +2028,10 @@ exprTemp.setLowerBound(lBound, false); case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ lBound = Expression(false, false); break; } @@ -2231,10 +2219,10 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.NOT, expr); ret.setPosition(begin, case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ ret = ExpressionEquality(prop, pathprop); break; } @@ -2423,10 +2411,10 @@ ret = new ExpressionUnaryOp(ExpressionUnaryOp.MINUS, expr); ret.setPosition(begi case LPARENTH: case DLBRACKET: case DLT: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ ret = ExpressionBasic(prop, pathprop); break; } @@ -2497,7 +2485,7 @@ Expression ExpressionBasic(boolean prop, boolean pathprop) throws ParseException ret = ExpressionStrategy(prop, pathprop); break; } - case DQUOTE:{ + case REG_QUOTED_IDENT:{ ret = ExpressionLabel(prop, pathprop); break; } @@ -3056,9 +3044,7 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index = Object indexDiv = null; jj_consume_token(LBRACE); if (jj_2_15(2147483647)) { - jj_consume_token(DQUOTE); - index = Identifier(); - jj_consume_token(DQUOTE); + index = QuotedIdentifier(); } else { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case A: @@ -3084,10 +3070,10 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index = case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ index = Expression(false, false); break; } @@ -3103,9 +3089,7 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index = jj_consume_token(DIVIDE); jj_consume_token(LBRACE); if (jj_2_16(2147483647)) { - jj_consume_token(DQUOTE); - indexDiv = Identifier(); - jj_consume_token(DQUOTE); + indexDiv = QuotedIdentifier(); } else { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case A: @@ -3131,10 +3115,10 @@ void RewardIndex(ExpressionReward exprRew) throws ParseException {Object index = case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ indexDiv = Expression(false, false); break; } @@ -3222,10 +3206,10 @@ exprTemp = new ExpressionTemporal(ExpressionTemporal.R_I, null, null); exprTemp. case DLBRACKET: case DLT: case MINUS: - case DQUOTE: case REG_INT: case REG_DOUBLE: - case REG_IDENT:{ + case REG_IDENT: + case REG_QUOTED_IDENT:{ expr = Expression(prop, true); ret = expr; break; @@ -3409,28 +3393,13 @@ s = getToken(0).image; // (Property) expression: label (including "init") static final public -Expression ExpressionLabel(boolean prop, boolean pathprop) throws ParseException {String s; +Expression ExpressionLabel(boolean prop, boolean pathprop) throws ParseException {ExpressionIdent qi; ExpressionLabel ret = null; Token begin; if (!prop) {if (true) throw generateParseException();} - begin = jj_consume_token(DQUOTE); - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case REG_IDENT:{ - s = Identifier(); - break; - } - case INIT:{ - jj_consume_token(INIT); -s = "init"; - break; - } - default: - jj_la1[95] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - jj_consume_token(DQUOTE); -ret = new ExpressionLabel(s); ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;} + // Label can be arbitary quoted identifier + qi = QuotedIdentifierExpression(); +ret = new ExpressionLabel(qi.getName()); ret.setPosition(qi,qi); {if ("" != null) return ret;} throw new Error("Missing return statement in function"); } @@ -3476,7 +3445,7 @@ op = "|"; break; } default: - jj_la1[96] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3489,7 +3458,7 @@ op = "|"; break; } default: - jj_la1[97] = jj_gen; + jj_la1[96] = jj_gen; ; } jj_consume_token(RPARENTH); @@ -3509,6 +3478,14 @@ String Identifier() throws ParseException { throw new Error("Missing return statement in function"); } + static final public String QuotedIdentifier() throws ParseException { + jj_consume_token(REG_QUOTED_IDENT); +String s = getToken(0).image; + // remove " + {if ("" != null) return s.substring(1,s.length()-1);} + throw new Error("Missing return statement in function"); + } + // Identifier (returns ExpressionIdent, storing position info) static final public ExpressionIdent IdentifierExpression() throws ParseException {String ident; @@ -3518,6 +3495,17 @@ ret = new ExpressionIdent(ident); ret.setPosition(getToken(0)); {if ("" != null) throw new Error("Missing return statement in function"); } +// QuotedIdentifier (returns ExpressionIdent, storing position info) + static final public +ExpressionIdent QuotedIdentifierExpression() throws ParseException {String ident; + ExpressionIdent ret; + Token begin; +begin = getToken(1); + ident = QuotedIdentifier(); +ret = new ExpressionIdent(ident); ret.setPosition(begin, getToken(0)); {if ("" != null) return ret;} + 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; @@ -3538,7 +3526,7 @@ ident="max"; break; } default: - jj_la1[98] = jj_gen; + jj_la1[97] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3575,7 +3563,7 @@ int EqNeq() throws ParseException { break; } default: - jj_la1[99] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3607,7 +3595,7 @@ int LtGt() throws ParseException { break; } default: - jj_la1[100] = jj_gen; + jj_la1[99] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3633,7 +3621,7 @@ begin = getToken(1); break; } default: - jj_la1[101] = jj_gen; + jj_la1[100] = jj_gen; ; } jj_consume_token(0); @@ -3793,20 +3781,20 @@ fl.setLHS(s); static private boolean jj_3R_187() { if (jj_scan_token(COMMA)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_163() + static private boolean jj_3R_165() { if (jj_scan_token(MIN)) return true; return false; } - static private boolean jj_3R_80() + static private boolean jj_3R_82() { if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_32()) return true; + if (jj_3R_34()) return true; if (jj_scan_token(RPARENTH)) return true; return false; } @@ -3823,17 +3811,15 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_155() + static private boolean jj_3R_157() { if (jj_scan_token(REG_INT)) return true; return false; } - static private boolean jj_3R_79() + static private boolean jj_3R_81() { - if (jj_scan_token(DQUOTE)) return true; - if (jj_3R_30()) return true; - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_31()) return true; return false; } @@ -3843,63 +3829,57 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_143() + static private boolean jj_3R_145() { Token xsp; xsp = jj_scanpos; - if (jj_3R_155()) { + if (jj_3R_157()) { jj_scanpos = xsp; - if (jj_3R_156()) { + if (jj_3R_158()) { jj_scanpos = xsp; - if (jj_3R_157()) { + if (jj_3R_159()) { jj_scanpos = xsp; - if (jj_3R_158()) return true; + if (jj_3R_160()) return true; } } } return false; } - static private boolean jj_3R_179() - { - if (jj_3R_30()) return true; - return false; - } - - static private boolean jj_3R_78() + static private boolean jj_3R_80() { if (jj_3R_30()) return true; return false; } - static private boolean jj_3R_71() + static private boolean jj_3R_73() { if (jj_scan_token(COMMA)) return true; if (jj_3R_30()) return true; return false; } - static private boolean jj_3R_161() + static private boolean jj_3R_163() { if (jj_scan_token(MAX)) return true; return false; } - static private boolean jj_3R_69() + static private boolean jj_3R_71() { Token xsp; xsp = jj_scanpos; - if (jj_3R_78()) { + if (jj_3R_80()) { jj_scanpos = xsp; - if (jj_3R_79()) { + if (jj_3R_81()) { jj_scanpos = xsp; - if (jj_3R_80()) return true; + if (jj_3R_82()) return true; } } return false; } - static private boolean jj_3R_154() + static private boolean jj_3R_156() { if (jj_scan_token(FILTER)) return true; if (jj_scan_token(LPARENTH)) return true; @@ -3922,16 +3902,16 @@ fl.setLHS(s); } } if (jj_scan_token(COMMA)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; xsp = jj_scanpos; if (jj_3R_187()) jj_scanpos = xsp; if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_162() + static private boolean jj_3R_164() { - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; Token xsp; while (true) { xsp = jj_scanpos; @@ -3940,7 +3920,7 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_92() + static private boolean jj_3R_94() { if (jj_scan_token(COMMA)) return true; if (jj_3R_30()) return true; @@ -3966,11 +3946,20 @@ fl.setLHS(s); static private boolean jj_3_3() { if (jj_scan_token(LABEL)) return true; - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_32()) return true; return false; } - static private boolean jj_3R_82() + static private boolean jj_3R_53() + { + if (jj_scan_token(OR)) return true; + if (jj_scan_token(OR)) return true; + if (jj_scan_token(OR)) return true; + if (jj_3R_38()) return true; + return false; + } + + static private boolean jj_3R_84() { if (jj_scan_token(LBRACE)) return true; if (jj_3R_30()) return true; @@ -3979,96 +3968,80 @@ fl.setLHS(s); Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_92()) { jj_scanpos = xsp; break; } + if (jj_3R_94()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3R_51() - { - if (jj_scan_token(OR)) return true; - if (jj_scan_token(OR)) return true; - if (jj_scan_token(OR)) return true; - if (jj_3R_36()) return true; - return false; - } - - static private boolean jj_3R_146() + static private boolean jj_3R_148() { if (jj_scan_token(FUNC)) return true; if (jj_scan_token(LPARENTH)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_163()) { + if (jj_3R_165()) { jj_scanpos = xsp; - if (jj_3R_164()) { + if (jj_3R_166()) { jj_scanpos = xsp; - if (jj_3R_165()) return true; + if (jj_3R_167()) return true; } } if (jj_scan_token(COMMA)) return true; - if (jj_3R_162()) return true; + if (jj_3R_164()) return true; if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_153() + static private boolean jj_3R_155() { - if (jj_scan_token(DQUOTE)) return true; - Token xsp; - xsp = jj_scanpos; - if (jj_3R_179()) { - jj_scanpos = xsp; - if (jj_3R_180()) return true; - } - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_32()) return true; return false; } static private boolean jj_3R_208() { - if (jj_3R_149()) return true; + if (jj_3R_151()) return true; return false; } - static private boolean jj_3R_81() + static private boolean jj_3R_72() { - if (jj_scan_token(DIVIDE)) return true; - if (jj_scan_token(LBRACE)) return true; - if (jj_3R_30()) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_91()) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_3R_83()) { + jj_scanpos = xsp; + if (jj_3R_84()) return true; } - if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3R_70() + static private boolean jj_3R_83() { + if (jj_scan_token(DIVIDE)) return true; + if (jj_scan_token(LBRACE)) return true; + if (jj_3R_30()) return true; Token xsp; - xsp = jj_scanpos; - if (jj_3R_81()) { - jj_scanpos = xsp; - if (jj_3R_82()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_93()) { jj_scanpos = xsp; break; } } + if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3R_59() + static private boolean jj_3R_61() { - if (jj_3R_69()) return true; + if (jj_3R_71()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_70()) { jj_scanpos = xsp; break; } + if (jj_3R_72()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_160() + static private boolean jj_3R_162() { if (jj_scan_token(MIN)) return true; return false; @@ -4081,16 +4054,16 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_145() + static private boolean jj_3R_147() { Token xsp; xsp = jj_scanpos; - if (jj_3R_160()) { + if (jj_3R_162()) { jj_scanpos = xsp; - if (jj_3R_161()) return true; + if (jj_3R_163()) return true; } if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_162()) return true; + if (jj_3R_164()) return true; if (jj_scan_token(RPARENTH)) return true; return false; } @@ -4099,25 +4072,25 @@ fl.setLHS(s); { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(91)) { + if (jj_scan_token(90)) { jj_scanpos = xsp; - if (jj_scan_token(94)) return true; + if (jj_scan_token(93)) return true; } return false; } - static private boolean jj_3R_44() + static private boolean jj_3R_46() { if (jj_scan_token(OR)) return true; if (jj_scan_token(OR)) return true; - if (jj_3R_50()) return true; + if (jj_3R_52()) return true; return false; } - static private boolean jj_3R_159() + static private boolean jj_3R_161() { if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_162()) return true; + if (jj_3R_164()) return true; if (jj_scan_token(RPARENTH)) return true; return false; } @@ -4155,12 +4128,12 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_144() + static private boolean jj_3R_146() { if (jj_3R_30()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_159()) jj_scanpos = xsp; + if (jj_3R_161()) jj_scanpos = xsp; return false; } @@ -4181,7 +4154,7 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_60() + static private boolean jj_3R_62() { if (jj_scan_token(OR)) return true; if (jj_scan_token(LBRACKET)) return true; @@ -4189,60 +4162,60 @@ fl.setLHS(s); Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_71()) { jj_scanpos = xsp; break; } + if (jj_3R_73()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACKET)) return true; if (jj_scan_token(OR)) return true; - if (jj_3R_59()) return true; + if (jj_3R_61()) return true; return false; } - static private boolean jj_3R_50() + static private boolean jj_3R_52() { - if (jj_3R_59()) return true; + if (jj_3R_61()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_60()) jj_scanpos = xsp; + if (jj_3R_62()) jj_scanpos = xsp; return false; } - static private boolean jj_3R_142() + static private boolean jj_3R_144() { - if (jj_3R_154()) return true; + if (jj_3R_156()) return true; return false; } - static private boolean jj_3R_141() + static private boolean jj_3R_143() { - if (jj_3R_153()) return true; + if (jj_3R_155()) return true; return false; } - static private boolean jj_3R_178() + static private boolean jj_3R_180() { - if (jj_3R_147()) return true; + if (jj_3R_149()) return true; return false; } - static private boolean jj_3R_140() + static private boolean jj_3R_142() { - if (jj_3R_152()) return true; + if (jj_3R_154()) return true; return false; } static private boolean jj_3R_207() { - if (jj_3R_148()) return true; + if (jj_3R_150()) return true; return false; } - static private boolean jj_3R_139() + static private boolean jj_3R_141() { - if (jj_3R_151()) return true; + if (jj_3R_153()) return true; return false; } - static private boolean jj_3R_177() + static private boolean jj_3R_179() { Token xsp; xsp = jj_scanpos; @@ -4253,7 +4226,7 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_176() + static private boolean jj_3R_178() { if (jj_scan_token(DLBRACKET)) return true; if (jj_3R_206()) return true; @@ -4261,145 +4234,139 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_138() + static private boolean jj_3R_140() { - if (jj_3R_150()) return true; + if (jj_3R_152()) return true; return false; } - static private boolean jj_3R_128() + static private boolean jj_3R_130() { if (jj_scan_token(DIVIDE)) return true; return false; } - static private boolean jj_3R_217() + static private boolean jj_3R_177() { - if (jj_3R_39()) return true; + if (jj_scan_token(DLT)) return true; + if (jj_3R_206()) return true; + if (jj_scan_token(DGT)) return true; return false; } - static private boolean jj_3R_175() + static private boolean jj_3R_139() { - if (jj_scan_token(DLT)) return true; - if (jj_3R_206()) return true; - if (jj_scan_token(DGT)) return true; + if (jj_3R_151()) return true; return false; } - static private boolean jj_3R_137() + static private boolean jj_3R_217() { - if (jj_3R_149()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_136() + static private boolean jj_3R_138() { - if (jj_3R_34()) return true; + if (jj_3R_36()) return true; return false; } - static private boolean jj_3R_135() + static private boolean jj_3R_137() { - if (jj_3R_148()) return true; + if (jj_3R_150()) return true; return false; } - static private boolean jj_3R_152() + static private boolean jj_3R_154() { Token xsp; xsp = jj_scanpos; - if (jj_3R_175()) { + if (jj_3R_177()) { jj_scanpos = xsp; - if (jj_3R_176()) return true; + if (jj_3R_178()) return true; } xsp = jj_scanpos; - if (jj_3R_177()) { + if (jj_3R_179()) { jj_scanpos = xsp; - if (jj_3R_178()) return true; + if (jj_3R_180()) return true; } return false; } - static private boolean jj_3R_134() + static private boolean jj_3R_136() { - if (jj_3R_147()) return true; + if (jj_3R_149()) return true; return false; } - static private boolean jj_3R_133() + static private boolean jj_3R_135() { - if (jj_3R_146()) return true; + if (jj_3R_148()) return true; return false; } - static private boolean jj_3R_43() + static private boolean jj_3R_45() { - if (jj_3R_50()) return true; + if (jj_3R_52()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_51()) { jj_scanpos = xsp; break; } + if (jj_3R_53()) { jj_scanpos = xsp; break; } } return false; } static private boolean jj_3_2() { - if (jj_scan_token(DQUOTE)) return true; - if (jj_3R_30()) return true; - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_31()) return true; if (jj_scan_token(COLON)) return true; return false; } - static private boolean jj_3R_132() + static private boolean jj_3R_134() { - if (jj_3R_145()) return true; + if (jj_3R_147()) return true; return false; } - static private boolean jj_3R_131() + static private boolean jj_3R_133() { - if (jj_3R_144()) return true; + if (jj_3R_146()) return true; return false; } - static private boolean jj_3R_130() + static private boolean jj_3R_132() { - if (jj_3R_143()) return true; + if (jj_3R_145()) return true; return false; } - static private boolean jj_3R_213() + static private boolean jj_3R_126() { - if (jj_3R_39()) return true; + if (jj_scan_token(MINUS)) return true; return false; } - static private boolean jj_3R_124() + static private boolean jj_3R_213() { - if (jj_scan_token(MINUS)) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_151() + static private boolean jj_3R_153() { if (jj_scan_token(A)) return true; if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_129() + static private boolean jj_3R_131() { Token xsp; xsp = jj_scanpos; - if (jj_3R_130()) { - jj_scanpos = xsp; - if (jj_3R_131()) { - jj_scanpos = xsp; if (jj_3R_132()) { jj_scanpos = xsp; if (jj_3R_133()) { @@ -4420,7 +4387,11 @@ fl.setLHS(s); jj_scanpos = xsp; if (jj_3R_141()) { jj_scanpos = xsp; - if (jj_3R_142()) return true; + if (jj_3R_142()) { + jj_scanpos = xsp; + if (jj_3R_143()) { + jj_scanpos = xsp; + if (jj_3R_144()) return true; } } } @@ -4436,80 +4407,78 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_126() + static private boolean jj_3R_128() { - if (jj_3R_129()) return true; + if (jj_3R_131()) return true; return false; } - static private boolean jj_3R_125() + static private boolean jj_3R_127() { if (jj_scan_token(MINUS)) return true; - if (jj_3R_121()) return true; + if (jj_3R_123()) return true; return false; } - static private boolean jj_3R_36() + static private boolean jj_3R_38() { - if (jj_3R_43()) return true; + if (jj_3R_45()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_44()) { jj_scanpos = xsp; break; } + if (jj_3R_46()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_121() + static private boolean jj_3R_123() { Token xsp; xsp = jj_scanpos; - if (jj_3R_125()) { + if (jj_3R_127()) { jj_scanpos = xsp; - if (jj_3R_126()) return true; + if (jj_3R_128()) return true; } return false; } - static private boolean jj_3R_150() + static private boolean jj_3R_152() { if (jj_scan_token(E)) return true; if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_127() + static private boolean jj_3R_129() { if (jj_scan_token(TIMES)) return true; return false; } - static private boolean jj_3R_32() + static private boolean jj_3R_34() { - if (jj_3R_36()) return true; + if (jj_3R_38()) return true; return false; } - static private boolean jj_3R_122() + static private boolean jj_3R_124() { Token xsp; xsp = jj_scanpos; - if (jj_3R_127()) { + if (jj_3R_129()) { jj_scanpos = xsp; - if (jj_3R_128()) return true; + if (jj_3R_130()) return true; } - if (jj_3R_121()) return true; + if (jj_3R_123()) return true; return false; } static private boolean jj_3_7() { - if (jj_scan_token(DQUOTE)) return true; - if (jj_3R_30()) return true; - if (jj_scan_token(DQUOTE)) return true; - if (jj_3R_32()) return true; + if (jj_3R_31()) return true; + if (jj_3R_34()) return true; return false; } @@ -4522,24 +4491,24 @@ fl.setLHS(s); static private boolean jj_3R_205() { - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_117() + static private boolean jj_3R_119() { - if (jj_3R_121()) return true; + if (jj_3R_123()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_122()) { jj_scanpos = xsp; break; } + if (jj_3R_124()) { jj_scanpos = xsp; break; } } return false; } static private boolean jj_3_17() { - if (jj_3R_34()) return true; + if (jj_3R_36()) return true; return false; } @@ -4547,13 +4516,13 @@ fl.setLHS(s); { if (jj_scan_token(I)) return true; if (jj_scan_token(EQ)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } static private boolean jj_3_16() { - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_31()) return true; return false; } @@ -4567,11 +4536,11 @@ fl.setLHS(s); { if (jj_scan_token(C)) return true; if (jj_scan_token(LE)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_123() + static private boolean jj_3R_125() { if (jj_scan_token(PLUS)) return true; return false; @@ -4583,39 +4552,37 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_174() + static private boolean jj_3R_176() { - if (jj_3R_48()) return true; + if (jj_3R_50()) return true; return false; } - static private boolean jj_3R_118() + static private boolean jj_3R_120() { Token xsp; xsp = jj_scanpos; - if (jj_3R_123()) { + if (jj_3R_125()) { jj_scanpos = xsp; - if (jj_3R_124()) return true; + if (jj_3R_126()) return true; } - if (jj_3R_117()) return true; + if (jj_3R_119()) return true; return false; } static private boolean jj_3R_200() { - if (jj_3R_34()) return true; + if (jj_3R_36()) return true; return false; } static private boolean jj_3R_216() { - if (jj_scan_token(DQUOTE)) return true; - if (jj_3R_30()) return true; - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_31()) return true; return false; } - static private boolean jj_3R_173() + static private boolean jj_3R_175() { Token xsp; xsp = jj_scanpos; @@ -4640,26 +4607,24 @@ fl.setLHS(s); static private boolean jj_3_15() { - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_31()) return true; return false; } - static private boolean jj_3R_114() + static private boolean jj_3R_116() { - if (jj_3R_117()) return true; + if (jj_3R_119()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_118()) { jj_scanpos = xsp; break; } + if (jj_3R_120()) { jj_scanpos = xsp; break; } } return false; } static private boolean jj_3R_212() { - if (jj_scan_token(DQUOTE)) return true; - if (jj_3R_30()) return true; - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_31()) return true; return false; } @@ -4677,10 +4642,10 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_115() + static private boolean jj_3R_117() { - if (jj_3R_46()) return true; - if (jj_3R_114()) return true; + if (jj_3R_48()) return true; + if (jj_3R_116()) return true; return false; } @@ -4699,13 +4664,13 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_112() + static private boolean jj_3R_114() { - if (jj_3R_114()) return true; + if (jj_3R_116()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_115()) { jj_scanpos = xsp; break; } + if (jj_3R_117()) { jj_scanpos = xsp; break; } } return false; } @@ -4718,71 +4683,71 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_113() + static private boolean jj_3R_115() { - if (jj_3R_116()) return true; - if (jj_3R_112()) return true; + if (jj_3R_118()) return true; + if (jj_3R_114()) return true; return false; } - static private boolean jj_3R_111() + static private boolean jj_3R_113() { - if (jj_3R_112()) return true; + if (jj_3R_114()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_113()) { jj_scanpos = xsp; break; } + if (jj_3R_115()) { jj_scanpos = xsp; break; } } return false; } static private boolean jj_3_6() { - if (jj_scan_token(DQUOTE)) return true; + if (jj_3R_31()) return true; return false; } - static private boolean jj_3R_110() + static private boolean jj_3R_112() { - if (jj_3R_111()) return true; + if (jj_3R_113()) return true; return false; } - static private boolean jj_3R_109() + static private boolean jj_3R_111() { if (jj_scan_token(NOT)) return true; - if (jj_3R_107()) return true; + if (jj_3R_109()) return true; return false; } - static private boolean jj_3R_102() + static private boolean jj_3R_104() { - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_100() + static private boolean jj_3R_102() { - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_98() + static private boolean jj_3R_100() { - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_96() + static private boolean jj_3R_98() { - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } static private boolean jj_3R_196() { - if (jj_3R_46()) return true; - if (jj_3R_39()) return true; + if (jj_3R_48()) return true; + if (jj_3R_41()) return true; return false; } @@ -4795,7 +4760,7 @@ fl.setLHS(s); static private boolean jj_3R_194() { if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_33()) return true; + if (jj_3R_35()) return true; if (jj_scan_token(RPARENTH)) return true; return false; } @@ -4808,7 +4773,7 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_172() + static private boolean jj_3R_174() { if (jj_scan_token(RMAX)) return true; if (jj_scan_token(EQ)) return true; @@ -4824,7 +4789,7 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_171() + static private boolean jj_3R_173() { if (jj_scan_token(RMIN)) return true; if (jj_scan_token(EQ)) return true; @@ -4832,13 +4797,13 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_107() + static private boolean jj_3R_109() { Token xsp; xsp = jj_scanpos; - if (jj_3R_109()) { + if (jj_3R_111()) { jj_scanpos = xsp; - if (jj_3R_110()) return true; + if (jj_3R_112()) return true; } return false; } @@ -4850,13 +4815,13 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_40() + static private boolean jj_3R_42() { - if (jj_3R_48()) return true; + if (jj_3R_50()) return true; return false; } - static private boolean jj_3R_170() + static private boolean jj_3R_172() { if (jj_scan_token(R)) return true; Token xsp; @@ -4878,187 +4843,187 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_108() + static private boolean jj_3R_110() { if (jj_scan_token(AND)) return true; - if (jj_3R_107()) return true; + if (jj_3R_109()) return true; return false; } - static private boolean jj_3R_149() + static private boolean jj_3R_151() { Token xsp; xsp = jj_scanpos; - if (jj_3R_170()) { + if (jj_3R_172()) { jj_scanpos = xsp; - if (jj_3R_171()) { + if (jj_3R_173()) { jj_scanpos = xsp; - if (jj_3R_172()) return true; + if (jj_3R_174()) return true; } } if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_173()) return true; + if (jj_3R_175()) return true; xsp = jj_scanpos; - if (jj_3R_174()) jj_scanpos = xsp; + if (jj_3R_176()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_105() + static private boolean jj_3R_107() { - if (jj_3R_107()) return true; + if (jj_3R_109()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_108()) { jj_scanpos = xsp; break; } + if (jj_3R_110()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_106() + static private boolean jj_3R_108() { if (jj_scan_token(OR)) return true; - if (jj_3R_105()) return true; + if (jj_3R_107()) return true; return false; } - static private boolean jj_3R_103() + static private boolean jj_3R_105() { - if (jj_3R_105()) return true; + if (jj_3R_107()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_106()) { jj_scanpos = xsp; break; } + if (jj_3R_108()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_42() + static private boolean jj_3R_44() { if (jj_scan_token(AND)) return true; - if (jj_3R_41()) return true; + if (jj_3R_43()) return true; return false; } - static private boolean jj_3R_104() + static private boolean jj_3R_106() { if (jj_scan_token(IFF)) return true; - if (jj_3R_103()) return true; + if (jj_3R_105()) return true; return false; } - static private boolean jj_3R_93() + static private boolean jj_3R_95() { - if (jj_3R_103()) return true; + if (jj_3R_105()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_104()) { jj_scanpos = xsp; break; } + if (jj_3R_106()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_38() + static private boolean jj_3R_47() { - if (jj_scan_token(EQ)) return true; - if (jj_scan_token(QMARK)) return true; + if (jj_scan_token(LPARENTH)) return true; + if (jj_3R_35()) return true; + if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_45() + static private boolean jj_3R_40() { - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_33()) return true; - if (jj_scan_token(RPARENTH)) return true; + if (jj_scan_token(EQ)) return true; + if (jj_scan_token(QMARK)) return true; return false; } - static private boolean jj_3R_37() + static private boolean jj_3R_39() { Token xsp; xsp = jj_scanpos; - if (jj_3R_45()) jj_scanpos = xsp; - if (jj_3R_46()) return true; - if (jj_3R_39()) return true; + if (jj_3R_47()) jj_scanpos = xsp; + if (jj_3R_48()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_41() + static private boolean jj_3R_43() { if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_49()) return true; + if (jj_3R_51()) return true; if (jj_scan_token(EQ)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_94() + static private boolean jj_3R_96() { if (jj_scan_token(IMPLIES)) return true; - if (jj_3R_93()) return true; + if (jj_3R_95()) return true; return false; } - static private boolean jj_3R_83() + static private boolean jj_3R_85() { - if (jj_3R_93()) return true; + if (jj_3R_95()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_94()) { jj_scanpos = xsp; break; } + if (jj_3R_96()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_34() + static private boolean jj_3R_36() { if (jj_scan_token(S)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_37()) { + if (jj_3R_39()) { jj_scanpos = xsp; - if (jj_3R_38()) return true; + if (jj_3R_40()) return true; } if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; xsp = jj_scanpos; - if (jj_3R_40()) jj_scanpos = xsp; + if (jj_3R_42()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_35() + static private boolean jj_3R_37() { - if (jj_3R_41()) return true; + if (jj_3R_43()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_42()) { jj_scanpos = xsp; break; } + if (jj_3R_44()) { jj_scanpos = xsp; break; } } return false; } static private boolean jj_3_5() { - if (jj_3R_31()) return true; + if (jj_3R_33()) return true; return false; } - static private boolean jj_3R_84() + static private boolean jj_3R_86() { if (jj_scan_token(QMARK)) return true; - if (jj_3R_83()) return true; + if (jj_3R_85()) return true; if (jj_scan_token(COLON)) return true; - if (jj_3R_76()) return true; + if (jj_3R_78()) return true; return false; } - static private boolean jj_3R_31() + static private boolean jj_3R_33() { Token xsp; xsp = jj_scanpos; - if (jj_3R_35()) { + if (jj_3R_37()) { jj_scanpos = xsp; if (jj_scan_token(54)) return true; } @@ -5067,189 +5032,230 @@ fl.setLHS(s); static private boolean jj_3_14() { - if (jj_3R_33()) return true; + if (jj_3R_35()) return true; if (jj_scan_token(LPARENTH)) return true; return false; } static private boolean jj_3_13() { - if (jj_3R_33()) return true; + if (jj_3R_35()) return true; if (jj_scan_token(LPARENTH)) return true; return false; } static private boolean jj_3_12() { - if (jj_3R_33()) return true; + if (jj_3R_35()) return true; if (jj_scan_token(LPARENTH)) return true; return false; } static private boolean jj_3_11() { - if (jj_3R_33()) return true; + if (jj_3R_35()) return true; if (jj_scan_token(LPARENTH)) return true; return false; } - static private boolean jj_3R_169() + static private boolean jj_3R_171() { - if (jj_3R_48()) return true; + if (jj_3R_50()) return true; return false; } - static private boolean jj_3R_68() + static private boolean jj_3R_70() { if (jj_scan_token(MAX)) return true; return false; } - static private boolean jj_3R_67() + static private boolean jj_3R_69() { if (jj_scan_token(MIN)) return true; return false; } - static private boolean jj_3R_76() + static private boolean jj_3R_78() { - if (jj_3R_83()) return true; + if (jj_3R_85()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_84()) jj_scanpos = xsp; + if (jj_3R_86()) jj_scanpos = xsp; + return false; + } + + static private boolean jj_3R_103() + { + if (jj_3R_35()) return true; return false; } static private boolean jj_3R_101() { - if (jj_3R_33()) return true; + if (jj_3R_35()) return true; return false; } static private boolean jj_3R_99() { - if (jj_3R_33()) return true; + if (jj_3R_35()) return true; + 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_33()) return true; + if (jj_3R_35()) return true; return false; } - static private boolean jj_3R_95() + static private boolean jj_3R_56() { - if (jj_3R_33()) return true; + if (jj_scan_token(GE)) return true; return false; } - static private boolean jj_3R_58() + 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; Token xsp; xsp = jj_scanpos; - if (jj_3R_67()) { + if (jj_3R_69()) { jj_scanpos = xsp; - if (jj_3R_68()) return true; + if (jj_3R_70()) return true; } if (jj_scan_token(RBRACE)) return true; return false; } - static private boolean jj_3R_90() + 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; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_89() + static private boolean jj_3R_91() { if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; if (jj_scan_token(COMMA)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_48() + static private boolean jj_3R_50() { if (jj_scan_token(LBRACE)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; if (jj_scan_token(RBRACE)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_58()) { jj_scanpos = xsp; break; } + if (jj_3R_60()) { jj_scanpos = xsp; break; } } return false; } - static private boolean jj_3R_88() + static private boolean jj_3R_90() { if (jj_scan_token(GT)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_101()) { + if (jj_3R_103()) { jj_scanpos = xsp; - if (jj_3R_102()) return true; + if (jj_3R_104()) return true; } return false; } - static private boolean jj_3R_87() + static private boolean jj_3R_89() { if (jj_scan_token(GE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_99()) { + if (jj_3R_101()) { jj_scanpos = xsp; - if (jj_3R_100()) return true; + if (jj_3R_102()) return true; } return false; } - static private boolean jj_3R_86() + static private boolean jj_3R_88() { if (jj_scan_token(LT)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_97()) { + if (jj_3R_99()) { jj_scanpos = xsp; - if (jj_3R_98()) return true; + if (jj_3R_100()) return true; } return false; } - static private boolean jj_3R_85() + static private boolean jj_3R_87() { if (jj_scan_token(LE)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_95()) { + if (jj_3R_97()) { jj_scanpos = xsp; - if (jj_3R_96()) return true; + if (jj_3R_98()) return true; } return false; } - static private boolean jj_3R_77() + static private boolean jj_3R_79() { Token xsp; xsp = jj_scanpos; - if (jj_3R_85()) { - jj_scanpos = xsp; - if (jj_3R_86()) { - jj_scanpos = xsp; if (jj_3R_87()) { jj_scanpos = xsp; if (jj_3R_88()) { jj_scanpos = xsp; if (jj_3R_89()) { jj_scanpos = xsp; - if (jj_3R_90()) return true; + if (jj_3R_90()) { + jj_scanpos = xsp; + if (jj_3R_91()) { + jj_scanpos = xsp; + if (jj_3R_92()) return true; } } } @@ -5258,106 +5264,94 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_62() + static private boolean jj_3R_122() { - if (jj_3R_76()) return true; + if (jj_scan_token(NE)) return true; return false; } - static private boolean jj_3R_75() + static private boolean jj_3R_118() { - if (jj_3R_77()) return true; + 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_74() + 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; + return false; + } + + static private boolean jj_3R_77() + { + if (jj_3R_79()) return true; + return false; + } + + static private boolean jj_3R_76() { if (jj_scan_token(G)) return true; return false; } - static private boolean jj_3R_73() + static private boolean jj_3R_75() { if (jj_scan_token(F)) return true; return false; } - static private boolean jj_3R_72() + static private boolean jj_3R_74() { if (jj_scan_token(X)) return true; return false; } - static private boolean jj_3R_61() + static private boolean jj_3R_63() { Token xsp; xsp = jj_scanpos; - if (jj_3R_72()) { + if (jj_3R_74()) { jj_scanpos = xsp; - if (jj_3R_73()) { + if (jj_3R_75()) { jj_scanpos = xsp; - if (jj_3R_74()) return true; + if (jj_3R_76()) return true; } } xsp = jj_scanpos; - if (jj_3R_75()) jj_scanpos = xsp; - if (jj_3R_56()) return true; - return false; - } - - static private boolean jj_3R_55() - { - if (jj_scan_token(LE)) return true; + if (jj_3R_77()) jj_scanpos = xsp; + if (jj_3R_58()) return true; return false; } static private boolean jj_3R_190() { - if (jj_3R_46()) return true; - if (jj_3R_39()) return true; + if (jj_3R_48()) return true; + if (jj_3R_41()) return true; return false; } static private boolean jj_3R_189() { if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_33()) return true; + if (jj_3R_35()) return true; if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_54() - { - if (jj_scan_token(GE)) return true; - return false; - } - - static private boolean jj_3R_53() - { - if (jj_scan_token(LT)) return true; - return false; - } - - static private boolean jj_3R_52() - { - if (jj_scan_token(GT)) return true; - return false; - } - - static private boolean jj_3R_46() + static private boolean jj_3R_51() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_52()) { - jj_scanpos = xsp; - if (jj_3R_53()) { - jj_scanpos = xsp; - if (jj_3R_54()) { - jj_scanpos = xsp; - if (jj_3R_55()) return true; - } - } - } + if (jj_scan_token(REG_IDENTPRIME)) return true; return false; } @@ -5384,7 +5378,7 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_168() + static private boolean jj_3R_170() { if (jj_scan_token(PMAX)) return true; if (jj_scan_token(EQ)) return true; @@ -5392,18 +5386,18 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_56() + static private boolean jj_3R_58() { Token xsp; xsp = jj_scanpos; - if (jj_3R_61()) { + if (jj_3R_63()) { jj_scanpos = xsp; - if (jj_3R_62()) return true; + if (jj_3R_64()) return true; } return false; } - static private boolean jj_3R_167() + static private boolean jj_3R_169() { if (jj_scan_token(PMIN)) return true; if (jj_scan_token(EQ)) return true; @@ -5411,48 +5405,25 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_120() - { - if (jj_scan_token(NE)) return true; - return false; - } - - static private boolean jj_3R_116() - { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_119()) { - jj_scanpos = xsp; - if (jj_3R_120()) return true; - } - return false; - } - - static private boolean jj_3R_119() - { - if (jj_scan_token(EQ)) return true; - return false; - } - - static private boolean jj_3R_66() + static private boolean jj_3R_68() { - if (jj_3R_77()) return true; + if (jj_3R_79()) return true; return false; } - static private boolean jj_3R_65() + static private boolean jj_3R_67() { if (jj_scan_token(R)) return true; return false; } - static private boolean jj_3R_64() + static private boolean jj_3R_66() { if (jj_scan_token(W)) return true; return false; } - static private boolean jj_3R_166() + static private boolean jj_3R_168() { if (jj_scan_token(P)) return true; Token xsp; @@ -5472,73 +5443,73 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_63() + static private boolean jj_3R_65() { if (jj_scan_token(U)) return true; return false; } - static private boolean jj_3R_148() + static private boolean jj_3R_150() { Token xsp; xsp = jj_scanpos; - if (jj_3R_166()) { + if (jj_3R_168()) { jj_scanpos = xsp; - if (jj_3R_167()) { + if (jj_3R_169()) { jj_scanpos = xsp; - if (jj_3R_168()) return true; + if (jj_3R_170()) return true; } } if (jj_scan_token(LBRACKET)) return true; - if (jj_3R_39()) return true; + if (jj_3R_41()) return true; xsp = jj_scanpos; - if (jj_3R_169()) jj_scanpos = xsp; + if (jj_3R_171()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } - static private boolean jj_3R_57() + static private boolean jj_3R_59() { Token xsp; xsp = jj_scanpos; - if (jj_3R_63()) { + if (jj_3R_65()) { jj_scanpos = xsp; - if (jj_3R_64()) { + if (jj_3R_66()) { jj_scanpos = xsp; - if (jj_3R_65()) return true; + if (jj_3R_67()) return true; } } xsp = jj_scanpos; - if (jj_3R_66()) jj_scanpos = xsp; - if (jj_3R_56()) return true; + if (jj_3R_68()) jj_scanpos = xsp; + if (jj_3R_58()) return true; return false; } - static private boolean jj_3R_188() + static private boolean jj_3R_32() { - if (jj_scan_token(COMMA)) return true; - if (jj_3R_39()) return true; + if (jj_3R_31()) return true; return false; } - static private boolean jj_3R_49() + static private boolean jj_3R_188() { - if (jj_scan_token(REG_IDENTPRIME)) return true; + if (jj_scan_token(COMMA)) return true; + if (jj_3R_41()) return true; return false; } - static private boolean jj_3R_165() + static private boolean jj_3R_167() { if (jj_3R_30()) return true; return false; } - static private boolean jj_3R_47() + static private boolean jj_3R_49() { - if (jj_3R_56()) return true; + if (jj_3R_58()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_57()) jj_scanpos = xsp; + if (jj_3R_59()) jj_scanpos = xsp; return false; } @@ -5548,40 +5519,46 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_91() + static private boolean jj_3R_93() { if (jj_scan_token(COMMA)) return true; if (jj_3R_30()) return true; return false; } - static private boolean jj_3R_147() + static private boolean jj_3R_35() { - if (jj_scan_token(LPARENTH)) return true; - if (jj_3R_39()) return true; - if (jj_scan_token(RPARENTH)) return true; + if (jj_3R_30()) return true; return false; } - static private boolean jj_3R_33() + static private boolean jj_3R_149() { - if (jj_3R_30()) return true; + if (jj_scan_token(LPARENTH)) return true; + if (jj_3R_41()) return true; + if (jj_scan_token(RPARENTH)) return true; return false; } - static private boolean jj_3R_164() + static private boolean jj_3R_166() { if (jj_scan_token(MAX)) return true; return false; } - static private boolean jj_3R_158() + static private boolean jj_3R_160() { if (jj_scan_token(FALSE)) return true; return false; } - static private boolean jj_3R_157() + static private boolean jj_3R_31() + { + if (jj_scan_token(REG_QUOTED_IDENT)) return true; + return false; + } + + static private boolean jj_3R_159() { if (jj_scan_token(TRUE)) return true; return false; @@ -5599,9 +5576,9 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_39() + static private boolean jj_3R_41() { - if (jj_3R_47()) return true; + if (jj_3R_49()) return true; return false; } @@ -5611,13 +5588,7 @@ fl.setLHS(s); return false; } - static private boolean jj_3R_180() - { - if (jj_scan_token(INIT)) return true; - return false; - } - - static private boolean jj_3R_156() + static private boolean jj_3R_158() { if (jj_scan_token(REG_DOUBLE)) return true; return false; @@ -5635,7 +5606,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[102]; + 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; @@ -5647,16 +5618,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,0x2000000,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,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,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,0x1,0x0,0x0,0x80000000,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x0,0x5c108088,0x1,0x5c108088,0x5c108088,0x1,0x5c108088,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x20,0x40000000,0x0,0x20,0x40000000,0x80000,0x5c108088,0x0,0x8,0x2,0x5c1080a8,0x40000000,0x20,0x2,0x2,0x400200,0x2,0x2,0x400200,0x44000008,0x0,0x66820,0x0,0x0,0x66820,0x5c108088,0x5c108088,0x5c108088,0x5c108088,0x5c108088,0x66820,0x2000000,0x0,0x0,0x0,0x0,0x5c108088,0x1800,0x66000,0x180000,0x180000,0x600000,0x600000,0x5c108088,0x5c008088,0x8,0x0,0x40000000,0x2,0x18000000,0x8,0x66800,0x0,0x200,0x200,0x0,0x8,0x66808,0x200,0x8,0x200,0x66800,0x0,0x200,0x5c108088,0x5c108088,0x400000,0x0,0x5c108088,0x8080,0x0,0x8,0x2,0x48000000,0x200000,0x48000000,0x40000000,0x40080000,0x2,0x40000000,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,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,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,}; } static final private JJCalls[] jj_2_rtns = new JJCalls[18]; static private boolean jj_rescan = false; @@ -5680,7 +5651,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; 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(); } @@ -5695,7 +5666,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; 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(); } @@ -5713,7 +5684,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; 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(); } @@ -5724,7 +5695,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; 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(); } @@ -5741,7 +5712,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; 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(); } @@ -5751,7 +5722,7 @@ fl.setLHS(s); token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 102; 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(); } @@ -5837,27 +5808,40 @@ fl.setLHS(s); static private int jj_endpos; static private void jj_add_error_token(int kind, int pos) { - if (pos >= 100) return; + if (pos >= 100) { + return; + } + if (pos == jj_endpos + 1) { jj_lasttokens[jj_endpos++] = kind; } else if (jj_endpos != 0) { jj_expentry = new int[jj_endpos]; + for (int i = 0; i < jj_endpos; i++) { jj_expentry[i] = jj_lasttokens[i]; } - jj_entries_loop: for (java.util.Iterator it = jj_expentries.iterator(); it.hasNext();) { - int[] oldentry = (int[])(it.next()); + + for (int[] oldentry : jj_expentries) { if (oldentry.length == jj_expentry.length) { + boolean isMatched = true; + for (int i = 0; i < jj_expentry.length; i++) { if (oldentry[i] != jj_expentry[i]) { - continue jj_entries_loop; + isMatched = false; + break; } + + } + if (isMatched) { + jj_expentries.add(jj_expentry); + break; } - jj_expentries.add(jj_expentry); - break jj_entries_loop; } } - if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind; + + if (pos != 0) { + jj_lasttokens[(jj_endpos = pos) - 1] = kind; + } } } @@ -5869,7 +5853,7 @@ fl.setLHS(s); la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 102; 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< jj_gen) { - jj_la = p.arg; jj_lastpos = jj_scanpos = p.first; - switch (i) { - case 0: jj_3_1(); break; - case 1: jj_3_2(); break; - case 2: jj_3_3(); break; - case 3: jj_3_4(); break; - case 4: jj_3_5(); break; - case 5: jj_3_6(); break; - case 6: jj_3_7(); break; - case 7: jj_3_8(); break; - case 8: jj_3_9(); break; - case 9: jj_3_10(); break; - case 10: jj_3_11(); break; - case 11: jj_3_12(); break; - case 12: jj_3_13(); break; - case 13: jj_3_14(); break; - case 14: jj_3_15(); break; - case 15: jj_3_16(); break; - case 16: jj_3_17(); break; - case 17: jj_3_18(); break; + try { + JJCalls p = jj_2_rtns[i]; + + do { + if (p.gen > jj_gen) { + jj_la = p.arg; jj_lastpos = jj_scanpos = p.first; + switch (i) { + case 0: jj_3_1(); break; + case 1: jj_3_2(); break; + case 2: jj_3_3(); break; + case 3: jj_3_4(); break; + case 4: jj_3_5(); break; + case 5: jj_3_6(); break; + case 6: jj_3_7(); break; + case 7: jj_3_8(); break; + case 8: jj_3_9(); break; + case 9: jj_3_10(); break; + case 10: jj_3_11(); break; + case 11: jj_3_12(); break; + case 12: jj_3_13(); break; + case 13: jj_3_14(); break; + case 14: jj_3_15(); break; + case 15: jj_3_16(); break; + case 16: jj_3_17(); break; + case 17: jj_3_18(); break; + } } - } - p = p.next; - } while (p != null); - } catch(LookaheadSuccess ls) { } + p = p.next; + } while (p != null); + + } catch(LookaheadSuccess ls) { } } jj_rescan = false; } @@ -5954,7 +5940,10 @@ fl.setLHS(s); if (p.next == null) { p = p.next = new JJCalls(); break; } p = p.next; } - p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla; + + p.gen = jj_gen + xla - jj_la; + p.first = token; + p.arg = xla; } static final class JJCalls { diff --git a/prism/src/parser/PrismParser.jj b/prism/src/parser/PrismParser.jj index d6d467b3..e972d818 100644 --- a/prism/src/parser/PrismParser.jj +++ b/prism/src/parser/PrismParser.jj @@ -977,7 +977,7 @@ Observable Observable() : } { { begin = getToken(1); } - ( name = Identifier() defn = Expression(false, false) ) + ( name = QuotedIdentifier() defn = Expression(false, false) ) { Observable obs = new Observable(name, defn); obs.setPosition(begin, getToken(0)); return obs; } } diff --git a/prism/src/parser/PrismParserConstants.java b/prism/src/parser/PrismParserConstants.java index ccd34d03..2c30bba5 100644 --- a/prism/src/parser/PrismParserConstants.java +++ b/prism/src/parser/PrismParserConstants.java @@ -189,15 +189,15 @@ public interface PrismParserConstants { /** RegularExpression Id. */ int QMARK = 89; /** RegularExpression Id. */ - int DQUOTE = 90; + int REG_INT = 90; /** RegularExpression Id. */ - int REG_INT = 91; + int REG_DOUBLE = 91; /** RegularExpression Id. */ - int REG_DOUBLE = 92; + int REG_IDENTPRIME = 92; /** RegularExpression Id. */ - int REG_IDENTPRIME = 93; + int REG_IDENT = 93; /** RegularExpression Id. */ - int REG_IDENT = 94; + int REG_QUOTED_IDENT = 94; /** RegularExpression Id. */ int PREPROC = 95; /** RegularExpression Id. */ @@ -298,11 +298,11 @@ public interface PrismParserConstants { "\"\\\'\"", "\"<-\"", "\"?\"", - "\"\\\"\"", "", "", "", "", + "", "", "", }; diff --git a/prism/src/parser/PrismParserTokenManager.java b/prism/src/parser/PrismParserTokenManager.java index 7223ae80..77fb198b 100644 --- a/prism/src/parser/PrismParserTokenManager.java +++ b/prism/src/parser/PrismParserTokenManager.java @@ -24,13 +24,13 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac switch (pos) { case 0: - if ((active0 & 0x18f01c409400908L) != 0L) - return 23; if ((active0 & 0x70fe3bf6bff6f0L) != 0L) { - jjmatchedKind = 94; - return 23; + jjmatchedKind = 93; + return 27; } + if ((active0 & 0x18f01c409400908L) != 0L) + return 27; if ((active1 & 0x400000L) != 0L) return 1; if ((active1 & 0x4L) != 0L) @@ -41,142 +41,142 @@ private static final int jjStopStringLiteralDfa_0(int pos, long active0, long ac { if (jjmatchedPos != 1) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 1; } - return 23; + return 27; } return -1; case 2: if ((active0 & 0x2001d0000000L) != 0L) - return 23; + return 27; if ((active0 & 0x73defa26bff6f0L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 2; - return 23; + return 27; } return -1; case 3: if ((active0 & 0x4358c002200490L) != 0L) - return 23; + return 27; if ((active0 & 0x30863a249ff260L) != 0L) { if (jjmatchedPos != 3) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 3; } - return 23; + return 27; } return -1; case 4: - if ((active0 & 0x60020040060L) != 0L) - return 23; if ((active0 & 0x30883a049bf200L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 4; - return 23; + return 27; } + if ((active0 & 0x60020040060L) != 0L) + return 27; return -1; case 5: if ((active0 & 0x20000200900200L) != 0L) - return 23; + return 27; if ((active0 & 0x108838040bf000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 5; - return 23; + return 27; } return -1; case 6: if ((active0 & 0x800000081000L) != 0L) - return 23; + return 27; if ((active0 & 0x1008380403e000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 6; - return 23; + return 27; } return -1; case 7: if ((active0 & 0x1008380403e000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 7; - return 23; + return 27; } return -1; case 8: if ((active0 & 0x4024000L) != 0L) - return 23; + return 27; if ((active0 & 0x1008380001a000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 8; - return 23; + return 27; } return -1; case 9: if ((active0 & 0x10003000010000L) != 0L) - return 23; + return 27; if ((active0 & 0x8080000a000L) != 0L) { if (jjmatchedPos != 9) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 9; } - return 23; + return 27; } return -1; case 10: - if ((active0 & 0x2000000000L) != 0L) - return 23; if ((active0 & 0x8080000a000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 10; - return 23; + return 27; } + if ((active0 & 0x2000000000L) != 0L) + return 27; return -1; case 11: - if ((active0 & 0x2000L) != 0L) - return 23; if ((active0 & 0x80800008000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 11; - return 23; + return 27; } + if ((active0 & 0x2000L) != 0L) + return 27; return -1; case 12: - if ((active0 & 0x80000000000L) != 0L) - return 23; if ((active0 & 0x800008000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 12; - return 23; + return 27; } + if ((active0 & 0x80000000000L) != 0L) + return 27; return -1; case 13: - if ((active0 & 0x8000L) != 0L) - return 23; if ((active0 & 0x800000000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 13; - return 23; + return 27; } + if ((active0 & 0x8000L) != 0L) + return 27; return -1; case 14: if ((active0 & 0x800000000L) != 0L) { - jjmatchedKind = 94; + jjmatchedKind = 93; jjmatchedPos = 14; - return 23; + return 27; } return -1; default : @@ -198,8 +198,6 @@ static private int jjMoveStringLiteralDfa0_0(){ case 33: jjmatchedKind = 57; return jjMoveStringLiteralDfa1_0(0x0L, 0x1000L); - case 34: - return jjStopAtPos(0, 90); case 38: return jjStopAtPos(0, 58); case 39: @@ -237,17 +235,17 @@ static private int jjMoveStringLiteralDfa0_0(){ case 63: return jjStopAtPos(0, 89); case 65: - return jjStartNfaWithStates_0(0, 3, 23); + return jjStartNfaWithStates_0(0, 3, 27); case 67: - return jjStartNfaWithStates_0(0, 8, 23); + return jjStartNfaWithStates_0(0, 8, 27); case 69: - return jjStartNfaWithStates_0(0, 11, 23); + return jjStartNfaWithStates_0(0, 11, 27); case 70: - return jjStartNfaWithStates_0(0, 22, 23); + return jjStartNfaWithStates_0(0, 22, 27); case 71: - return jjStartNfaWithStates_0(0, 24, 23); + return jjStartNfaWithStates_0(0, 24, 27); case 73: - return jjStartNfaWithStates_0(0, 27, 23); + return jjStartNfaWithStates_0(0, 27, 27); case 80: jjmatchedKind = 40; return jjMoveStringLiteralDfa1_0(0xc000000000L, 0x0L); @@ -255,13 +253,13 @@ static private int jjMoveStringLiteralDfa0_0(){ jjmatchedKind = 50; return jjMoveStringLiteralDfa1_0(0x3000000000000L, 0x0L); case 83: - return jjStartNfaWithStates_0(0, 51, 23); + return jjStartNfaWithStates_0(0, 51, 27); case 85: - return jjStartNfaWithStates_0(0, 55, 23); + return jjStartNfaWithStates_0(0, 55, 27); case 87: - return jjStartNfaWithStates_0(0, 56, 23); + return jjStartNfaWithStates_0(0, 56, 27); case 88: - return jjStartNfaWithStates_0(0, 34, 23); + return jjStartNfaWithStates_0(0, 34, 27); case 91: jjmatchedKind = 69; return jjMoveStringLiteralDfa1_0(0x0L, 0x80L); @@ -402,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, 23); + return jjStartNfaWithStates_0(2, 45, 27); return jjMoveStringLiteralDfa3_0(active0, 0x1004000000000L); case 98: return jjMoveStringLiteralDfa3_0(active0, 0x20000000L); @@ -416,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, 23); + return jjStartNfaWithStates_0(2, 32, 27); return jjMoveStringLiteralDfa3_0(active0, 0x800200040L); case 111: return jjMoveStringLiteralDfa3_0(active0, 0x10180000800030L); case 112: if ((active0 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(2, 31, 23); + return jjStartNfaWithStates_0(2, 31, 27); return jjMoveStringLiteralDfa3_0(active0, 0x40000000000L); case 114: return jjMoveStringLiteralDfa3_0(active0, 0x80000L); @@ -430,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, 23); + return jjStartNfaWithStates_0(2, 28, 27); return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L); case 117: return jjMoveStringLiteralDfa3_0(active0, 0x40000000000200L); @@ -440,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, 23); + return jjStartNfaWithStates_0(2, 30, 27); break; default : break; @@ -468,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, 23); + return jjStartNfaWithStates_0(3, 7, 27); else if ((active0 & 0x400L) != 0L) - return jjStartNfaWithStates_0(3, 10, 23); + return jjStartNfaWithStates_0(3, 10, 27); else if ((active0 & 0x200000L) != 0L) - return jjStartNfaWithStates_0(3, 21, 23); + return jjStartNfaWithStates_0(3, 21, 27); return jjMoveStringLiteralDfa4_0(active0, 0x10000000000020L); case 100: return jjMoveStringLiteralDfa4_0(active0, 0x20800000000L); case 101: if ((active0 & 0x400000000000L) != 0L) - return jjStartNfaWithStates_0(3, 46, 23); + return jjStartNfaWithStates_0(3, 46, 27); else if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 54, 23); + return jjStartNfaWithStates_0(3, 54, 27); return jjMoveStringLiteralDfa4_0(active0, 0x3020000000L); case 105: return jjMoveStringLiteralDfa4_0(active0, 0x3000L); case 108: if ((active0 & 0x10L) != 0L) - return jjStartNfaWithStates_0(3, 4, 23); + return jjStartNfaWithStates_0(3, 4, 27); break; case 109: return jjMoveStringLiteralDfa4_0(active0, 0x84000L); case 110: if ((active0 & 0x8000000000L) != 0L) - return jjStartNfaWithStates_0(3, 39, 23); + return jjStartNfaWithStates_0(3, 39, 27); else if ((active0 & 0x2000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 49, 23); + return jjStartNfaWithStates_0(3, 49, 27); break; case 111: return jjMoveStringLiteralDfa4_0(active0, 0x8000L); @@ -504,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, 23); + return jjStartNfaWithStates_0(3, 25, 27); return jjMoveStringLiteralDfa4_0(active0, 0x20040000100000L); case 117: return jjMoveStringLiteralDfa4_0(active0, 0x200000000L); case 120: if ((active0 & 0x4000000000L) != 0L) - return jjStartNfaWithStates_0(3, 38, 23); + return jjStartNfaWithStates_0(3, 38, 27); else if ((active0 & 0x1000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 48, 23); + return jjStartNfaWithStates_0(3, 48, 27); break; default : break; @@ -531,23 +529,23 @@ static private int jjMoveStringLiteralDfa4_0(long old0, long active0){ { case 97: if ((active0 & 0x40000000000L) != 0L) - return jjStartNfaWithStates_0(4, 42, 23); + return jjStartNfaWithStates_0(4, 42, 27); return jjMoveStringLiteralDfa5_0(active0, 0x80000800000L); case 98: return jjMoveStringLiteralDfa5_0(active0, 0x8000L); case 101: if ((active0 & 0x40000L) != 0L) - return jjStartNfaWithStates_0(4, 18, 23); + return jjStartNfaWithStates_0(4, 18, 27); return jjMoveStringLiteralDfa5_0(active0, 0x20000800110000L); case 104: return jjMoveStringLiteralDfa5_0(active0, 0x10000000000000L); case 107: if ((active0 & 0x20L) != 0L) - return jjStartNfaWithStates_0(4, 5, 23); + return jjStartNfaWithStates_0(4, 5, 27); break; case 108: if ((active0 & 0x20000000L) != 0L) - return jjStartNfaWithStates_0(4, 29, 23); + return jjStartNfaWithStates_0(4, 29, 27); return jjMoveStringLiteralDfa5_0(active0, 0x200000200L); case 110: return jjMoveStringLiteralDfa5_0(active0, 0x3000L); @@ -555,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, 23); + return jjStartNfaWithStates_0(4, 41, 27); break; case 114: return jjMoveStringLiteralDfa5_0(active0, 0x803004000000L); case 116: if ((active0 & 0x40L) != 0L) - return jjStartNfaWithStates_0(4, 6, 23); + return jjStartNfaWithStates_0(4, 6, 27); break; case 117: return jjMoveStringLiteralDfa5_0(active0, 0x80000L); @@ -590,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, 23); + return jjStartNfaWithStates_0(5, 9, 27); else if ((active0 & 0x200000000L) != 0L) - return jjStartNfaWithStates_0(5, 33, 23); + return jjStartNfaWithStates_0(5, 33, 27); break; case 105: return jjMoveStringLiteralDfa6_0(active0, 0x4001000L); case 108: if ((active0 & 0x800000L) != 0L) - return jjStartNfaWithStates_0(5, 23, 23); + return jjStartNfaWithStates_0(5, 23, 27); return jjMoveStringLiteralDfa6_0(active0, 0x80000L); case 109: if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 53, 23); + return jjStartNfaWithStates_0(5, 53, 27); break; case 114: if ((active0 & 0x100000L) != 0L) - return jjStartNfaWithStates_0(5, 20, 23); + return jjStartNfaWithStates_0(5, 20, 27); break; case 115: return jjMoveStringLiteralDfa6_0(active0, 0x28000L); @@ -633,7 +631,7 @@ static private int jjMoveStringLiteralDfa6_0(long old0, long active0){ { case 97: if ((active0 & 0x80000L) != 0L) - return jjStartNfaWithStates_0(6, 19, 23); + return jjStartNfaWithStates_0(6, 19, 27); return jjMoveStringLiteralDfa7_0(active0, 0x3004012000L); case 101: return jjMoveStringLiteralDfa7_0(active0, 0x800008000L); @@ -641,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, 23); + return jjStartNfaWithStates_0(6, 47, 27); return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L); case 116: if ((active0 & 0x1000L) != 0L) - return jjStartNfaWithStates_0(6, 12, 23); + return jjStartNfaWithStates_0(6, 12, 27); return jjMoveStringLiteralDfa7_0(active0, 0x20000L); case 117: return jjMoveStringLiteralDfa7_0(active0, 0x4000L); @@ -695,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, 23); + return jjStartNfaWithStates_0(8, 14, 27); break; case 105: return jjMoveStringLiteralDfa9_0(active0, 0x10080000002000L); @@ -703,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, 23); + return jjStartNfaWithStates_0(8, 17, 27); return jjMoveStringLiteralDfa9_0(active0, 0x800000000L); case 116: if ((active0 & 0x4000000L) != 0L) - return jjStartNfaWithStates_0(8, 26, 23); + return jjStartNfaWithStates_0(8, 26, 27); break; case 118: return jjMoveStringLiteralDfa9_0(active0, 0x8000L); @@ -730,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, 23); + return jjStartNfaWithStates_0(9, 52, 27); break; case 101: if ((active0 & 0x1000000000L) != 0L) @@ -743,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, 23); + return jjStartNfaWithStates_0(9, 16, 27); return jjMoveStringLiteralDfa10_0(active0, 0x80000000000L); default : break; @@ -766,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, 23); + return jjStartNfaWithStates_0(10, 37, 27); break; case 116: return jjMoveStringLiteralDfa11_0(active0, 0x80000000000L); @@ -791,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, 23); + return jjStartNfaWithStates_0(11, 13, 27); break; default : break; @@ -810,7 +808,7 @@ static private int jjMoveStringLiteralDfa12_0(long old0, long active0){ { case 99: if ((active0 & 0x80000000000L) != 0L) - return jjStartNfaWithStates_0(12, 43, 23); + return jjStartNfaWithStates_0(12, 43, 27); break; case 101: return jjMoveStringLiteralDfa13_0(active0, 0x8000L); @@ -833,7 +831,7 @@ static private int jjMoveStringLiteralDfa13_0(long old0, long active0){ { case 115: if ((active0 & 0x8000L) != 0L) - return jjStartNfaWithStates_0(13, 15, 23); + return jjStartNfaWithStates_0(13, 15, 27); break; case 116: return jjMoveStringLiteralDfa14_0(active0, 0x800000000L); @@ -871,7 +869,7 @@ static private int jjMoveStringLiteralDfa15_0(long old0, long active0){ { case 99: if ((active0 & 0x800000000L) != 0L) - return jjStartNfaWithStates_0(15, 35, 23); + return jjStartNfaWithStates_0(15, 35, 27); break; default : break; @@ -895,7 +893,7 @@ static final long[] jjbitVec2 = { static private int jjMoveNfa_0(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 23; + jjnewStateCnt = 27; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -910,26 +908,26 @@ static private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 23: + case 27: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 94) - kind = 94; - { jjCheckNAdd(22); } + if (kind > 93) + kind = 93; + { jjCheckNAdd(26); } } else if (curChar == 39) { - if (kind > 93) - kind = 93; + if (kind > 92) + kind = 92; } if ((0x3ff000000000000L & l) != 0L) - { jjCheckNAddTwoStates(20, 21); } + { jjCheckNAddTwoStates(24, 25); } break; case 0: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 92) - kind = 92; + if (kind > 91) + kind = 91; { jjCheckNAddStates(0, 3); } } else if ((0x100002600L & l) != 0L) @@ -938,21 +936,23 @@ static private int jjMoveNfa_0(int startState, int curPos) kind = 1; } else if (curChar == 35) - { jjCheckNAddTwoStates(16, 17); } + { jjCheckNAddTwoStates(20, 21); } + else if (curChar == 34) + jjstateSet[jjnewStateCnt++] = 16; else if (curChar == 46) { jjCheckNAdd(11); } else if (curChar == 47) jjstateSet[jjnewStateCnt++] = 1; if ((0x3fe000000000000L & l) != 0L) { - if (kind > 91) - kind = 91; + if (kind > 90) + kind = 90; { jjCheckNAdd(8); } } else if (curChar == 48) { - if (kind > 91) - kind = 91; + if (kind > 90) + kind = 90; } break; case 1: @@ -988,20 +988,20 @@ static private int jjMoveNfa_0(int startState, int curPos) case 7: if ((0x3fe000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 90) + kind = 90; { jjCheckNAdd(8); } break; case 8: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 91) - kind = 91; + if (kind > 90) + kind = 90; { jjCheckNAdd(8); } break; case 9: - if (curChar == 48 && kind > 91) - kind = 91; + if (curChar == 48 && kind > 90) + kind = 90; break; case 10: if (curChar == 46) @@ -1010,8 +1010,8 @@ static private int jjMoveNfa_0(int startState, int curPos) case 11: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 91) + kind = 91; { jjCheckNAddTwoStates(11, 12); } break; case 13: @@ -1021,43 +1021,55 @@ static private int jjMoveNfa_0(int startState, int curPos) case 14: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 91) + kind = 91; { 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(16, 17); } + { jjCheckNAddTwoStates(20, 21); } break; - case 16: + case 20: if ((0xfffffff7ffffffffL & l) != 0L) - { jjCheckNAddTwoStates(16, 17); } + { jjCheckNAddTwoStates(20, 21); } break; - case 17: + case 21: if (curChar == 35 && kind > 95) kind = 95; break; - case 18: + case 22: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 91) + kind = 91; { jjCheckNAddStates(0, 3); } break; - case 20: + case 24: if ((0x3ff000000000000L & l) != 0L) - { jjCheckNAddTwoStates(20, 21); } + { jjCheckNAddTwoStates(24, 25); } break; - case 21: - if (curChar == 39 && kind > 93) - kind = 93; + case 25: + if (curChar == 39 && kind > 92) + kind = 92; break; - case 22: + case 26: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 94) - kind = 94; - { jjCheckNAdd(22); } + if (kind > 93) + kind = 93; + { jjCheckNAdd(26); } break; default : break; } @@ -1070,22 +1082,22 @@ static private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 23: + case 27: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 94) - kind = 94; - { jjCheckNAdd(22); } + if (kind > 93) + kind = 93; + { jjCheckNAdd(26); } } if ((0x7fffffe87fffffeL & l) != 0L) - { jjCheckNAddTwoStates(20, 21); } + { jjCheckNAddTwoStates(24, 25); } break; case 0: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 94) - kind = 94; - { jjCheckNAddStates(7, 9); } + if (kind > 93) + kind = 93; + { jjCheckNAddStates(9, 11); } break; case 2: if (kind > 2) @@ -1094,21 +1106,26 @@ static private int jjMoveNfa_0(int startState, int curPos) break; case 12: if ((0x2000000020L & l) != 0L) - { jjAddStates(10, 11); } + { jjAddStates(12, 13); } break; case 16: - { jjAddStates(12, 13); } + case 17: + if ((0x7fffffe87fffffeL & l) != 0L) + { jjCheckNAddTwoStates(17, 18); } break; case 20: + { jjAddStates(14, 15); } + break; + case 24: if ((0x7fffffe87fffffeL & l) != 0L) - { jjCheckNAddTwoStates(20, 21); } + { jjCheckNAddTwoStates(24, 25); } break; - case 22: + case 26: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 94) - kind = 94; - { jjCheckNAdd(22); } + if (kind > 93) + kind = 93; + { jjCheckNAdd(26); } break; default : break; } @@ -1132,9 +1149,9 @@ static private int jjMoveNfa_0(int startState, int curPos) kind = 2; { jjAddStates(4, 6); } break; - case 16: + case 20: if (jjCanMove_0(hiByte, i1, i2, l1, l2)) - { jjAddStates(12, 13); } + { jjAddStates(14, 15); } break; default : if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break; else break; } @@ -1147,14 +1164,14 @@ static private int jjMoveNfa_0(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 23 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 27 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } } } static final int[] jjnextStates = { - 10, 11, 12, 18, 2, 3, 5, 20, 21, 22, 13, 14, 16, 17, + 10, 11, 12, 22, 2, 3, 5, 17, 18, 24, 25, 26, 13, 14, 20, 21, }; private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) { @@ -1189,7 +1206,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", "\42", null, null, null, null, null, null, }; +"\77", null, null, null, null, null, null, null, }; static protected Token jjFillToken() { final Token t; @@ -1235,7 +1252,7 @@ public static Token getNextToken() { curChar = input_stream.BeginToken(); } - catch(java.io.IOException e) + catch(Exception e) { jjmatchedKind = 0; jjmatchedPos = -1; @@ -1345,6 +1362,7 @@ static private void jjCheckNAddStates(int start, int end) /** Reinitialise parser. */ static public void ReInit(SimpleCharStream stream) { + jjmatchedPos = jjnewStateCnt = 0; curLexState = defaultLexState; input_stream = stream; @@ -1355,14 +1373,15 @@ static private void jjCheckNAddStates(int start, int end) { int i; jjround = 0x80000001; - for (i = 23; i-- > 0;) + for (i = 27; i-- > 0;) jjrounds[i] = 0x80000000; } /** Reinitialise parser. */ - static public void ReInit(SimpleCharStream stream, int lexState) + static public void ReInit( SimpleCharStream stream, int lexState) { - ReInit(stream); + + ReInit( stream); SwitchTo(lexState); } @@ -1390,9 +1409,9 @@ static final long[] jjtoSpecial = { }; static protected SimpleCharStream input_stream; - static private final int[] jjrounds = new int[23]; - static private final int[] jjstateSet = new int[2 * 23]; + static private final int[] jjrounds = new int[27]; + static private final int[] jjstateSet = new int[2 * 27]; - static protected char curChar; + static protected int curChar; } diff --git a/prism/src/parser/SimpleCharStream.java b/prism/src/parser/SimpleCharStream.java index 063996ff..4d035e45 100644 --- a/prism/src/parser/SimpleCharStream.java +++ b/prism/src/parser/SimpleCharStream.java @@ -1,4 +1,4 @@ -/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 6.0 */ +/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 6.1 */ /* JavaCCOptions:STATIC=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ package parser; @@ -30,13 +30,14 @@ public class SimpleCharStream static protected char[] buffer; static protected int maxNextCharInd = 0; static protected int inBuf = 0; - static protected int tabSize = 8; + static protected int tabSize = 1; static protected boolean trackLineColumn = true; static public void setTabSize(int i) { tabSize = i; } static public int getTabSize() { return tabSize; } + static protected void ExpandBuff(boolean wrapAround) { char[] newbuffer = new char[bufsize + 2048]; @@ -471,8 +472,7 @@ public class SimpleCharStream line = bufline[j]; column = bufcolumn[j]; } - static boolean getTrackLineColumn() { return trackLineColumn; } static void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; } } -/* JavaCC - OriginalChecksum=dcc1df1ef735c110db7f51764c3f7f64 (do not edit this line) */ +/* JavaCC - OriginalChecksum=cf7f6842068a3a63d9871130dfbff36e (do not edit this line) */ diff --git a/prism/src/parser/Token.java b/prism/src/parser/Token.java index acc5cc30..f497f4ac 100644 --- a/prism/src/parser/Token.java +++ b/prism/src/parser/Token.java @@ -1,5 +1,5 @@ -/* Generated By:JavaCC: Do not edit this line. Token.java Version 6.0 */ -/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ +/* Generated By:JavaCC: Do not edit this line. Token.java Version 6.1 */ +/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */ package parser; /** @@ -128,4 +128,4 @@ public class Token implements java.io.Serializable { } } -/* JavaCC - OriginalChecksum=7d751264ae152bf5b6855a5f69a4ab67 (do not edit this line) */ +/* JavaCC - OriginalChecksum=cee95ae321b2c0bf682ab95fa968c14c (do not edit this line) */ diff --git a/prism/src/parser/TokenMgrError.java b/prism/src/parser/TokenMgrError.java index bc8ef8be..16ec483e 100644 --- a/prism/src/parser/TokenMgrError.java +++ b/prism/src/parser/TokenMgrError.java @@ -1,4 +1,4 @@ -/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 6.0 */ +/* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 6.1 */ /* JavaCCOptions: */ package parser; @@ -20,22 +20,22 @@ public class TokenMgrError extends Error /** * Lexical error occurred. */ - static final int LEXICAL_ERROR = 0; + public static final int LEXICAL_ERROR = 0; /** * An attempt was made to create a second instance of a static token manager. */ - static final int STATIC_LEXER_ERROR = 1; + public static final int STATIC_LEXER_ERROR = 1; /** * Tried to change to an invalid lexical state. */ - static final int INVALID_LEXICAL_STATE = 2; + public static final int INVALID_LEXICAL_STATE = 2; /** * Detected (and bailed out of) an infinite loop in the token manager. */ - static final int LOOP_DETECTED = 3; + public static final int LOOP_DETECTED = 3; /** * Indicates the reason why the exception is thrown. It will have @@ -53,8 +53,6 @@ public class TokenMgrError extends Error for (int i = 0; i < str.length(); i++) { switch (str.charAt(i)) { - case 0 : - continue; case '\b': retval.append("\\b"); continue; @@ -104,11 +102,12 @@ public class TokenMgrError extends Error * curchar : the offending character * Note: You can customize the lexical error message by modifying this method. */ - protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { + protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) { + char curChar1 = (char)curChar; return("Lexical error at line " + errorLine + ", column " + errorColumn + ". Encountered: " + - (EOFSeen ? " " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") + + (EOFSeen ? " " : ("\"" + addEscapes(String.valueOf(curChar1)) + "\"") + " (" + (int)curChar + "), ") + "after : \"" + addEscapes(errorAfter) + "\""); } @@ -140,8 +139,8 @@ public class TokenMgrError extends Error } /** Full Constructor. */ - public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) { - this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); + public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) { + this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason); } } -/* JavaCC - OriginalChecksum=6c4705c2bebd89492711d8a1e624d837 (do not edit this line) */ +/* JavaCC - OriginalChecksum=e6cc0598680ea0c2cb81e9cf37216aa9 (do not edit this line) */