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=735974868ec8d4ae851d4490661b95eccf93bdd1;hb=00b73fe170154840ac11c2a9403c6bcd9a0e673a;hpb=f5b8a3d0b68ab33a78235c5dfa84fc1d45f6271e 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 735974868..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 = 345; - private static final int TERMINAL_COUNT = 83; - private static final int NONTERMINAL_COUNT = 51; - private static final int PRODUCT_COUNT = 132; + 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 = 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[6360]; - private static final int[] ERROR_TABLE = new int[895]; + 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[1711]; + 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; @@ -64,6 +64,7 @@ public abstract class SCLParser { "EXTENDS", "MAPPING_RELATION", "FOLLOWS", + "RULESET", "IMPORT", "INCLUDE", "AS", @@ -85,6 +86,7 @@ public abstract class SCLParser { "MATCH", "DO", "MDO", + "EDO", "ENFORCE", "BLANK", "FLOAT", @@ -98,6 +100,7 @@ public abstract class SCLParser { "SELECT_DISTINCT", "TRANSFORMATION", "EQ", + "CHR_SELECT", "ATTACHED_DOT", "IN", "THEN", @@ -141,10 +144,10 @@ public abstract class SCLParser { "atype", "aexp", "ruleDeclarations", + "statements", "importSpec", "importItem", "fieldDeclaration", - "statements", "guardedExpEq", "fundep", "ruleDeclaration", @@ -155,11 +158,12 @@ public abstract class SCLParser { "accessor", "case", "queryBlock", + "verboseChrQuery", "stringLiteral", "symbolWithoutMinus", "listQualifier", "chrQuery", - "verboseChrQuery", + "chrQueryPart", "caseRhs", "guardedExpArrow", "equation", @@ -393,19 +397,19 @@ public abstract class SCLParser { return parse(0); } public Object parseCommands() { - return parse(330); + return parse(347); } public Object parseImport() { - return parse(337); + return parse(355); } public Object parseType() { - return parse(339); + return parse(357); } public Object parseExp() { - return parse(341); + return parse(359); } public Object parseEquationBlock() { - return parse(343); + return parse(361); } @@ -461,208 +465,222 @@ public abstract class SCLParser { case 23: return reduceRelationDefinition(); case 24: - return reduceStatementCommand(); + return reduceRulesetDefinition(); case 25: - return reduceImportCommand(); + return reduceStatementCommand(); case 26: - return reduceGuardStatement(); + return reduceImportCommand(); case 27: - return reduceLetStatement(); + return reduceGuardStatement(); case 28: - return reduceBindStatement(); + return reduceLetStatement(); case 29: - return reduceRuleStatement(); + return reduceBindStatement(); case 30: - return reduceCHRStatement(); + return reduceRuleStatement(); case 31: - return reduceVerboseCHRStatement(); + return reduceCHRStatement(); case 32: - return reduceConstraintStatement(); + return reduceVerboseCHRStatement(); case 33: - return reduceDeclarations(); + return reduceConstraintStatement(); case 34: - return reduceField(); + return reduceLocalInclude(); case 35: - return reduceFieldShorthand(); + return reduceDeclarations(); case 36: - return reduceVarId(); + return reduceField(); case 37: - return reduceEscapedSymbol(); + return reduceFieldShorthand(); case 38: - return reduceTupleConstructor(); + return reduceWildcard(); case 39: - return reduceBinary(); + return reduceVarId(); case 40: - return reduceSimpleRhs(); + return reduceEscapedSymbol(); case 41: - return reduceGuardedRhs(); + return reduceTupleConstructor(); case 42: - return reduceConstructor(); + return reduceBinary(); case 43: - return reduceRecordConstructor(); + return reduceSimpleRhs(); case 44: - return reduceContext(); + return reduceGuardedRhs(); case 45: - return reduceFundeps(); + return reduceConstructor(); case 46: - return reduceTypeVar(); + return reduceRecordConstructor(); case 47: - return reduceTupleType(); + return reduceContext(); case 48: - return reduceListType(); + return reduceFundeps(); case 49: - return reduceListTypeConstructor(); + return reduceTypeVar(); case 50: - return reduceTupleTypeConstructor(); + return reduceTupleType(); case 51: - return reduceLambda(); + return reduceListType(); case 52: - return reduceLambdaMatch(); + return reduceListTypeConstructor(); case 53: - return reduceLet(); + return reduceTupleTypeConstructor(); case 54: - return reduceIf(); + return reduceLambda(); case 55: - return reduceMatch(); + return reduceLambdaMatch(); case 56: - return reduceDo(); + return reduceLet(); case 57: - return reduceSelect(); + return reduceIf(); case 58: - return reduceEnforce(); + return reduceMatch(); case 59: - return reduceVar(); + return reduceDo(); case 60: - return reduceHashedId(); + return reduceSelect(); case 61: - return reduceBlank(); + return reduceCHRSelect(); case 62: - return reduceInteger(); + return reduceEnforce(); case 63: - return reduceFloat(); + return reduceVar(); case 64: - return reduceString(); + return reduceHashedId(); case 65: - return reduceChar(); + return reduceBlank(); case 66: - return reduceTuple(); + return reduceInteger(); case 67: - return reduceViewPattern(); + return reduceFloat(); case 68: - return reduceRightSection(); + return reduceString(); case 69: - return reduceLeftSection(); + return reduceChar(); case 70: - return reduceListLiteral(); + return reduceTuple(); case 71: - return reduceRange(); + return reduceViewPattern(); case 72: - return reduceListComprehension(); + return reduceRightSection(); case 73: - return reduceAs(); + return reduceLeftSection(); case 74: - return reduceRecord(); + return reduceListLiteral(); case 75: - return reduceTransformation(); + return reduceRange(); case 76: - return reduceEq(); + return reduceListComprehension(); case 77: - return reduceRuleDeclarations(); + return reduceAs(); case 78: - return reduceImportShowing(); + return reduceRecord(); case 79: - return reduceImportHiding(); + return reduceTransformation(); case 80: - return reduceImportValueItem(); + return reduceEq(); case 81: - return reduceFieldDescription(); + return reduceRuleDeclarations(); case 82: return reduceStatements(); case 83: - return reduceGuardedExpEq(); + return reduceImportShowing(); case 84: - return reduceFundep(); + return reduceImportHiding(); case 85: - return reduceQueryRuleDeclaration(); + return reduceImportValueItem(); case 86: - return reduceAnnotation(); + return reduceFieldDescription(); case 87: - return reduceGuardQuery(); + return reduceGuardedExpEq(); case 88: - return reduceEqualsQuery(); + return reduceFundep(); case 89: - return reduceBindQuery(); + return reduceQueryRuleDeclaration(); case 90: - return reduceCompositeQuery(); + return reduceAnnotation(); case 91: - return reduceApply(); + return reduceGuardQuery(); case 92: - return reduceSymbol(); + return reduceEqualsQuery(); case 93: - return reduceEscapedId(); + return reduceBindQuery(); case 94: - return reduceMinus(); + return reduceCompositeQuery(); case 95: - return reduceLess(); + return reduceApply(); case 96: - return reduceGreater(); + return reduceSymbol(); case 97: - return reduceDot(); + return reduceEscapedId(); case 98: - return reduceFieldAccess(); + return reduceMinus(); case 99: - return reduceIdAccessor(); + return reduceLess(); case 100: - return reduceStringAccessor(); + return reduceGreater(); case 101: - return reduceExpAccessor(); + return reduceDot(); case 102: - return reduceCase(); + return reduceFieldAccess(); case 103: - return reduceQueryBlock(); + return reduceIdAccessor(); case 104: - return reduceStringLiteral(); + return reduceStringAccessor(); case 105: - return reduceSymbol(); + return reduceExpAccessor(); case 106: - return reduceEscapedId(); + return reduceCase(); case 107: - return reduceLess(); + return reduceQueryBlock(); case 108: - return reduceGreater(); + return reduceVerboseCHRConjunction(); case 109: - return reduceDot(); + return reduceStringLiteral(); case 110: - return reduceGuardQualifier(); + return reduceSymbol(); case 111: - return reduceLetQualifier(); + return reduceEscapedId(); case 112: - return reduceBindQualifier(); + return reduceLess(); case 113: - return reduceThenQualifier(); + return reduceGreater(); case 114: - return reduceCHRQuery(); + return reduceDot(); case 115: - return reduceVerboseCHRQuery(); + return reduceGuardQualifier(); case 116: - return reduceSimpleCaseRhs(); + return reduceLetQualifier(); case 117: - return reduceGuardedCaseRhs(); + return reduceBindQualifier(); case 118: - return reduceGuardedExpArrow(); + return reduceThenQualifier(); case 119: - return reduceGuardEquation(); + return reduceCHRConjunction(); case 120: - return reduceBasicEquation(); + return reduceCHRAtom(); case 121: - return reduceEffect(); + return reduceCHREquals(); case 122: - return reduceJustEtype(); + return reduceCHRBinds(); case 123: - return reduceForAll(); + return reduceSimpleCaseRhs(); case 124: - return reduceApplyType(); + return reduceGuardedCaseRhs(); case 125: + return reduceGuardedExpArrow(); + case 126: + return reduceGuardEquation(); + case 127: + return reduceBasicEquation(); + case 128: + return reduceEffect(); + case 129: + return reduceJustEtype(); + case 130: + return reduceForAll(); + case 131: + return reduceApplyType(); + case 132: return reduceDummy(); default: @@ -779,6 +797,10 @@ public abstract class SCLParser { * declaration ::= bexp FOLLOWS ruleDeclarations */ protected abstract Object reduceRelationDefinition(); + /** + * declaration ::= RULESET ID WHERE statements + */ + protected abstract Object reduceRulesetDefinition(); /** * command ::= statement */ @@ -812,9 +834,13 @@ public abstract class SCLParser { */ protected abstract Object reduceVerboseCHRStatement(); /** - * statement ::= CONSTRAINT ID atype* + * statement ::= CONSTRAINT constructor */ protected abstract Object reduceConstraintStatement(); + /** + * statement ::= INCLUDE ID aexp + */ + protected abstract Object reduceLocalInclude(); /** * declarations ::= LBRACE (declaration (SEMICOLON (declaration SEMICOLON)* declaration)?)? RBRACE */ @@ -827,6 +853,10 @@ public abstract class SCLParser { * field ::= ID */ protected abstract Object reduceFieldShorthand(); + /** + * field ::= DOTDOT + */ + protected abstract Object reduceWildcard(); /** * var ::= ID */ @@ -908,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 */ @@ -995,6 +1029,10 @@ public abstract class SCLParser { * ruleDeclarations ::= LBRACE (ruleDeclaration (SEMICOLON (ruleDeclaration SEMICOLON)* ruleDeclaration)?)? RBRACE */ protected abstract Object reduceRuleDeclarations(); + /** + * statements ::= LBRACE (statement (SEMICOLON (statement SEMICOLON)* statement)?)? RBRACE + */ + protected abstract Object reduceStatements(); /** * importSpec ::= LPAREN (importItem (COMMA (importItem COMMA)* importItem)?)? RPAREN */ @@ -1011,10 +1049,6 @@ public abstract class SCLParser { * fieldDeclaration ::= ID HASTYPE type */ protected abstract Object reduceFieldDescription(); - /** - * statements ::= LBRACE (statement (SEMICOLON (statement SEMICOLON)* statement)?)? RBRACE - */ - protected abstract Object reduceStatements(); /** * guardedExpEq ::= BAR exp (COMMA exp)* EQUALS exp */ @@ -1095,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 */ @@ -1116,13 +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 reduceCHRAtom(); + /** + * chrQueryPart ::= exp EQUALS exp */ - protected abstract Object reduceCHRQuery(); + protected abstract Object reduceCHREquals(); /** - * verboseChrQuery ::= LBRACE listQualifier (SEMICOLON listQualifier)* RBRACE + * chrQueryPart ::= exp BINDS exp */ - protected abstract Object reduceVerboseCHRQuery(); + protected abstract Object reduceCHRBinds(); /** * caseRhs ::= ARROW exp (WHERE statements)? */