X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Finternal%2Fparsing%2Fparser%2FSCLParser.java;h=6852771b1b8558f107758215e1e557d31dc56cf2;hp=fc2242dce632d482d95170a31f9bafe86d8a1eb3;hb=00b73fe170154840ac11c2a9403c6bcd9a0e673a;hpb=6d233d1b05176e40f634766537082d2a2ec65fd0 diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java index fc2242dce..6852771b1 100644 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java @@ -13,18 +13,18 @@ public abstract class SCLParser { public static final boolean TRACE = false; private static final int INITIAL_CAPACITY = 16; - private static final int STATE_COUNT = 358; - private static final int TERMINAL_COUNT = 84; + private static final int STATE_COUNT = 363; + private static final int TERMINAL_COUNT = 86; private static final int NONTERMINAL_COUNT = 52; - private static final int PRODUCT_COUNT = 135; + private static final int PRODUCT_COUNT = 139; private static final int[] ACTION_ROW_ID = new int[STATE_COUNT]; private static final int[] ACTION_COLUMN_ID = new int[TERMINAL_COUNT]; - private static final short[] ACTION_TABLE = new short[6944]; - private static final int[] ERROR_TABLE = new int[940]; + private static final short[] ACTION_TABLE = new short[6765]; + private static final int[] ERROR_TABLE = new int[976]; private static final int[] GOTO_ROW_ID = new int[STATE_COUNT]; private static final int[] GOTO_COLUMN_ID = new int[NONTERMINAL_COUNT]; - private static final short[] GOTO_TABLE = new short[1708]; + private static final short[] GOTO_TABLE = new short[1953]; private static final int[] PRODUCT_LHS = new int[PRODUCT_COUNT]; private static final short STATE_MASK = (short)0x0fff; @@ -86,6 +86,7 @@ public abstract class SCLParser { "MATCH", "DO", "MDO", + "EDO", "ENFORCE", "BLANK", "FLOAT", @@ -99,6 +100,7 @@ public abstract class SCLParser { "SELECT_DISTINCT", "TRANSFORMATION", "EQ", + "CHR_SELECT", "ATTACHED_DOT", "IN", "THEN", @@ -156,12 +158,12 @@ public abstract class SCLParser { "accessor", "case", "queryBlock", + "verboseChrQuery", "stringLiteral", "symbolWithoutMinus", "listQualifier", "chrQuery", - "verboseChrQuery", - "constraintSpec", + "chrQueryPart", "caseRhs", "guardedExpArrow", "equation", @@ -395,19 +397,19 @@ public abstract class SCLParser { return parse(0); } public Object parseCommands() { - return parse(342); + return parse(347); } public Object parseImport() { - return parse(350); + return parse(355); } public Object parseType() { - return parse(352); + return parse(357); } public Object parseExp() { - return parse(354); + return parse(359); } public Object parseEquationBlock() { - return parse(356); + return parse(361); } @@ -491,186 +493,194 @@ public abstract class SCLParser { case 37: return reduceFieldShorthand(); case 38: - return reduceVarId(); + return reduceWildcard(); case 39: - return reduceEscapedSymbol(); + return reduceVarId(); case 40: - return reduceTupleConstructor(); + return reduceEscapedSymbol(); case 41: - return reduceBinary(); + return reduceTupleConstructor(); case 42: - return reduceSimpleRhs(); + return reduceBinary(); case 43: - return reduceGuardedRhs(); + return reduceSimpleRhs(); case 44: - return reduceConstructor(); + return reduceGuardedRhs(); case 45: - return reduceRecordConstructor(); + return reduceConstructor(); case 46: - return reduceContext(); + return reduceRecordConstructor(); case 47: - return reduceFundeps(); + return reduceContext(); case 48: - return reduceTypeVar(); + return reduceFundeps(); case 49: - return reduceTupleType(); + return reduceTypeVar(); case 50: - return reduceListType(); + return reduceTupleType(); case 51: - return reduceListTypeConstructor(); + return reduceListType(); case 52: - return reduceTupleTypeConstructor(); + return reduceListTypeConstructor(); case 53: - return reduceLambda(); + return reduceTupleTypeConstructor(); case 54: - return reduceLambdaMatch(); + return reduceLambda(); case 55: - return reduceLet(); + return reduceLambdaMatch(); case 56: - return reduceIf(); + return reduceLet(); case 57: - return reduceMatch(); + return reduceIf(); case 58: - return reduceDo(); + return reduceMatch(); case 59: - return reduceSelect(); + return reduceDo(); case 60: - return reduceEnforce(); + return reduceSelect(); case 61: - return reduceVar(); + return reduceCHRSelect(); case 62: - return reduceHashedId(); + return reduceEnforce(); case 63: - return reduceBlank(); + return reduceVar(); case 64: - return reduceInteger(); + return reduceHashedId(); case 65: - return reduceFloat(); + return reduceBlank(); case 66: - return reduceString(); + return reduceInteger(); case 67: - return reduceChar(); + return reduceFloat(); case 68: - return reduceTuple(); + return reduceString(); case 69: - return reduceViewPattern(); + return reduceChar(); case 70: - return reduceRightSection(); + return reduceTuple(); case 71: - return reduceLeftSection(); + return reduceViewPattern(); case 72: - return reduceListLiteral(); + return reduceRightSection(); case 73: - return reduceRange(); + return reduceLeftSection(); case 74: - return reduceListComprehension(); + return reduceListLiteral(); case 75: - return reduceAs(); + return reduceRange(); case 76: - return reduceRecord(); + return reduceListComprehension(); case 77: - return reduceTransformation(); + return reduceAs(); case 78: - return reduceEq(); + return reduceRecord(); case 79: - return reduceRuleDeclarations(); + return reduceTransformation(); case 80: - return reduceStatements(); + return reduceEq(); case 81: - return reduceImportShowing(); + return reduceRuleDeclarations(); case 82: - return reduceImportHiding(); + return reduceStatements(); case 83: - return reduceImportValueItem(); + return reduceImportShowing(); case 84: - return reduceFieldDescription(); + return reduceImportHiding(); case 85: - return reduceGuardedExpEq(); + return reduceImportValueItem(); case 86: - return reduceFundep(); + return reduceFieldDescription(); case 87: - return reduceQueryRuleDeclaration(); + return reduceGuardedExpEq(); case 88: - return reduceAnnotation(); + return reduceFundep(); case 89: - return reduceGuardQuery(); + return reduceQueryRuleDeclaration(); case 90: - return reduceEqualsQuery(); + return reduceAnnotation(); case 91: - return reduceBindQuery(); + return reduceGuardQuery(); case 92: - return reduceCompositeQuery(); + return reduceEqualsQuery(); case 93: - return reduceApply(); + return reduceBindQuery(); case 94: - return reduceSymbol(); + return reduceCompositeQuery(); case 95: - return reduceEscapedId(); + return reduceApply(); case 96: - return reduceMinus(); + return reduceSymbol(); case 97: - return reduceLess(); + return reduceEscapedId(); case 98: - return reduceGreater(); + return reduceMinus(); case 99: - return reduceDot(); + return reduceLess(); case 100: - return reduceFieldAccess(); + return reduceGreater(); case 101: - return reduceIdAccessor(); + return reduceDot(); case 102: - return reduceStringAccessor(); + return reduceFieldAccess(); case 103: - return reduceExpAccessor(); + return reduceIdAccessor(); case 104: - return reduceCase(); + return reduceStringAccessor(); case 105: - return reduceQueryBlock(); + return reduceExpAccessor(); case 106: - return reduceStringLiteral(); + return reduceCase(); case 107: - return reduceSymbol(); + return reduceQueryBlock(); case 108: - return reduceEscapedId(); + return reduceVerboseCHRConjunction(); case 109: - return reduceLess(); + return reduceStringLiteral(); case 110: - return reduceGreater(); + return reduceSymbol(); case 111: - return reduceDot(); + return reduceEscapedId(); case 112: - return reduceGuardQualifier(); + return reduceLess(); case 113: - return reduceLetQualifier(); + return reduceGreater(); case 114: - return reduceBindQualifier(); + return reduceDot(); case 115: - return reduceThenQualifier(); + return reduceGuardQualifier(); case 116: - return reduceCHRQuery(); + return reduceLetQualifier(); case 117: - return reduceVerboseCHRQuery(); + return reduceBindQualifier(); case 118: - return reduceConstraintSpec(); + return reduceThenQualifier(); case 119: - return reduceSimpleCaseRhs(); + return reduceCHRConjunction(); case 120: - return reduceGuardedCaseRhs(); + return reduceCHRAtom(); case 121: - return reduceGuardedExpArrow(); + return reduceCHREquals(); case 122: - return reduceGuardEquation(); + return reduceCHRBinds(); case 123: - return reduceBasicEquation(); + return reduceSimpleCaseRhs(); case 124: - return reduceEffect(); + return reduceGuardedCaseRhs(); case 125: - return reduceJustEtype(); + return reduceGuardedExpArrow(); case 126: - return reduceForAll(); + return reduceGuardEquation(); case 127: - return reduceApplyType(); + return reduceBasicEquation(); case 128: + return reduceEffect(); + case 129: + return reduceJustEtype(); + case 130: + return reduceForAll(); + case 131: + return reduceApplyType(); + case 132: return reduceDummy(); default: @@ -824,7 +834,7 @@ public abstract class SCLParser { */ protected abstract Object reduceVerboseCHRStatement(); /** - * statement ::= CONSTRAINT constructor (WHERE constraintSpec)? + * statement ::= CONSTRAINT constructor */ protected abstract Object reduceConstraintStatement(); /** @@ -843,6 +853,10 @@ public abstract class SCLParser { * field ::= ID */ protected abstract Object reduceFieldShorthand(); + /** + * field ::= DOTDOT + */ + protected abstract Object reduceWildcard(); /** * var ::= ID */ @@ -924,13 +938,17 @@ public abstract class SCLParser { */ protected abstract Object reduceMatch(); /** - * aexp ::= (DO | MDO) statements + * aexp ::= (DO | MDO | EDO) statements */ protected abstract Object reduceDo(); /** * aexp ::= (SELECT | SELECT_FIRST | SELECT_DISTINCT) exp WHERE queryBlock */ protected abstract Object reduceSelect(); + /** + * aexp ::= CHR_SELECT exp WHERE verboseChrQuery + */ + protected abstract Object reduceCHRSelect(); /** * aexp ::= ENFORCE queryBlock */ @@ -1111,6 +1129,10 @@ public abstract class SCLParser { * queryBlock ::= LBRACE (query (SEMICOLON (query SEMICOLON)* query)?)? RBRACE */ protected abstract Object reduceQueryBlock(); + /** + * verboseChrQuery ::= LBRACE chrQuery (SEMICOLON chrQuery)* RBRACE + */ + protected abstract Object reduceVerboseCHRConjunction(); /** * stringLiteral ::= BEGIN_STRING (SUSPEND_STRING exp CONTINUE_STRING)* END_STRING */ @@ -1132,17 +1154,21 @@ public abstract class SCLParser { */ protected abstract Object reduceThenQualifier(); /** - * chrQuery ::= (listQualifier COMMA)* listQualifier + * chrQuery ::= (chrQueryPart COMMA)* chrQueryPart + */ + protected abstract Object reduceCHRConjunction(); + /** + * chrQueryPart ::= exp */ - protected abstract Object reduceCHRQuery(); + protected abstract Object reduceCHRAtom(); /** - * verboseChrQuery ::= LBRACE listQualifier (SEMICOLON listQualifier)* RBRACE + * chrQueryPart ::= exp EQUALS exp */ - protected abstract Object reduceVerboseCHRQuery(); + protected abstract Object reduceCHREquals(); /** - * constraintSpec ::= LBRACE exp (SEMICOLON exp)* RBRACE + * chrQueryPart ::= exp BINDS exp */ - protected abstract Object reduceConstraintSpec(); + protected abstract Object reduceCHRBinds(); /** * caseRhs ::= ARROW exp (WHERE statements)? */