X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Finternal%2Fparsing%2Fparser%2FSCLParser.java;h=6278817097fffebc0c52fda65c6c7968a006f807;hb=3d043320cdee8dda92758f4ea1c324a82c7d9094;hp=362bc51420da61eccbac64be9e5165a84bf88cf9;hpb=90b5d2ee1cfe82a75a097116f2f34ddb1cdff067;p=simantics%2Fplatform.git 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 362bc5142..627881709 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 = 349; - private static final int TERMINAL_COUNT = 83; - private static final int NONTERMINAL_COUNT = 51; - private static final int PRODUCT_COUNT = 133; + private static final int STATE_COUNT = 368; + private static final int TERMINAL_COUNT = 88; + private static final int NONTERMINAL_COUNT = 52; + private static final int PRODUCT_COUNT = 142; 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[6396]; - private static final int[] ERROR_TABLE = new int[906]; + private static final short[] ACTION_TABLE = new short[6820]; + private static final int[] ERROR_TABLE = new int[1012]; 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[1652]; + 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", @@ -72,7 +73,6 @@ public abstract class SCLParser { "HIDING", "ARROW", "COLON", - "WITH", "MINUS", "SYMBOL", "LESS", @@ -86,6 +86,7 @@ public abstract class SCLParser { "MATCH", "DO", "MDO", + "EDO", "ENFORCE", "BLANK", "FLOAT", @@ -99,10 +100,12 @@ public abstract class SCLParser { "SELECT_DISTINCT", "TRANSFORMATION", "EQ", + "CHR_SELECT", "ATTACHED_DOT", "IN", "THEN", "ELSE", + "WITH", "RBRACKET", "DOTDOT", "AT", @@ -115,6 +118,8 @@ public abstract class SCLParser { "BY", "QUERY_OP", "FORALL", + "DOUBLE_LESS", + "DOUBLE_GREATER", "COMMENT", "EOL", "EOF" @@ -141,25 +146,26 @@ public abstract class SCLParser { "atype", "aexp", "ruleDeclarations", + "statements", "importSpec", "importItem", "fieldDeclaration", - "statements", "guardedExpEq", "fundep", "ruleDeclaration", "query", - "queryBlock", "lexp", "symbol", "faexp", "accessor", "case", + "queryBlock", + "verboseChrQuery", "stringLiteral", "symbolWithoutMinus", "listQualifier", "chrQuery", - "verboseChrQuery", + "chrQueryPart", "caseRhs", "guardedExpArrow", "equation", @@ -393,19 +399,19 @@ public abstract class SCLParser { return parse(0); } public Object parseCommands() { - return parse(334); + return parse(352); } public Object parseImport() { - return parse(341); + return parse(360); } public Object parseType() { - return parse(343); + return parse(362); } public Object parseExp() { - return parse(345); + return parse(364); } public Object parseEquationBlock() { - return parse(347); + return parse(366); } @@ -425,43 +431,43 @@ public abstract class SCLParser { case 5: return reduceLocalTypeAnnotation(); case 6: - return reduceEntityTypeAnnotation(); - case 7: return reduceEquationBlock(); - case 8: + case 7: return reduceModuleHeader(); - case 9: + case 8: return reduceTypeAnnotation(); - case 10: + case 9: return reduceValueDefinition(); - case 11: + case 10: return reduceDataDefinition(); - case 12: + case 11: return reduceTypeDefinition(); - case 13: + case 12: return reduceClassDefinition(); - case 14: + case 13: return reduceInstanceDefinition(); - case 15: + case 14: return reduceDerivingInstanceDefinition(); - case 16: + case 15: return reduceDocumentationString(); - case 17: + case 16: return reduceAnnotation(); - case 18: + case 17: return reducePrecedenceDefinition(); - case 19: + case 18: return reduceJustImport(); - case 20: + case 19: return reduceImportJava(); - case 21: + case 20: return reduceEffectDefinition(); - case 22: + case 21: return reduceRuleDefinition(); - case 23: + case 22: return reduceMappingRelationDefinition(); - case 24: + case 23: return reduceRelationDefinition(); + case 24: + return reduceRulesetDefinition(); case 25: return reduceStatementCommand(); case 26: @@ -481,190 +487,208 @@ public abstract class SCLParser { case 33: return reduceConstraintStatement(); case 34: - return reduceDeclarations(); + return reduceLocalInclude(); case 35: - return reduceField(); + return reduceDeclarations(); case 36: - return reduceFieldShorthand(); + return reduceField(); case 37: - return reduceVarId(); + return reduceFieldShorthand(); case 38: - return reduceEscapedSymbol(); + return reduceWildcard(); case 39: - return reduceTupleConstructor(); + return reduceVarId(); case 40: - return reduceBinary(); + return reduceEscapedSymbol(); case 41: - return reduceSimpleRhs(); + return reduceTupleConstructor(); case 42: - return reduceGuardedRhs(); + return reduceBinary(); case 43: - return reduceConstructor(); + return reduceSimpleRhs(); case 44: - return reduceRecordConstructor(); + return reduceGuardedRhs(); case 45: - return reduceContext(); + return reduceConstructor(); case 46: - return reduceFundeps(); + return reduceRecordConstructor(); case 47: - return reduceTypeVar(); + return reduceContext(); case 48: - return reduceTupleType(); + return reduceFundeps(); case 49: - return reduceListType(); + return reduceTypeVar(); case 50: - return reduceListTypeConstructor(); + return reducePlainEffect(); case 51: - return reduceTupleTypeConstructor(); + return reduceTupleType(); case 52: - return reduceLambda(); + return reduceListType(); case 53: - return reduceLambdaMatch(); + return reduceListTypeConstructor(); case 54: - return reduceLet(); + return reduceTupleTypeConstructor(); case 55: - return reduceIf(); + return reduceLambda(); case 56: - return reduceMatch(); + return reduceLambdaMatch(); case 57: - return reduceDo(); + return reduceLet(); case 58: - return reduceSelect(); + return reduceIf(); case 59: - return reduceEnforce(); + return reduceMatch(); case 60: - return reduceVar(); + return reduceDo(); case 61: - return reduceHashedId(); + return reduceSelect(); case 62: - return reduceBlank(); + return reduceCHRSelect(); case 63: - return reduceInteger(); + return reduceEnforce(); case 64: - return reduceFloat(); + return reduceVar(); case 65: - return reduceString(); + return reduceHashedId(); case 66: - return reduceChar(); + return reduceBlank(); case 67: - return reduceTuple(); + return reduceInteger(); case 68: - return reduceViewPattern(); + return reduceFloat(); case 69: - return reduceRightSection(); + return reduceString(); case 70: - return reduceLeftSection(); + return reduceChar(); case 71: - return reduceListLiteral(); + return reduceTuple(); case 72: - return reduceRange(); + return reduceViewPattern(); case 73: - return reduceListComprehension(); + return reduceRightSection(); case 74: - return reduceAs(); + return reduceLeftSection(); case 75: - return reduceRecord(); + return reduceListLiteral(); case 76: - return reduceTransformation(); + return reduceRange(); case 77: - return reduceEq(); + return reduceListComprehension(); case 78: - return reduceRuleDeclarations(); + return reduceAs(); case 79: - return reduceImportShowing(); + return reduceRecord(); case 80: - return reduceImportHiding(); + return reduceTransformation(); case 81: - return reduceImportValueItem(); + return reduceEq(); case 82: - return reduceFieldDescription(); + return reduceRuleDeclarations(); case 83: return reduceStatements(); case 84: - return reduceGuardedExpEq(); + return reduceImportShowing(); case 85: - return reduceFundep(); + return reduceImportHiding(); case 86: - return reduceQueryRuleDeclaration(); + return reduceImportValueItem(); case 87: - return reduceAnnotation(); + return reduceFieldDescription(); case 88: - return reduceGuardQuery(); + return reduceGuardedExpEq(); case 89: - return reduceEqualsQuery(); + return reduceFundep(); case 90: - return reduceBindQuery(); + return reduceQueryRuleDeclaration(); case 91: - return reduceCompositeQuery(); + return reduceAnnotation(); case 92: - return reduceQueryBlock(); + return reduceGuardQuery(); case 93: - return reduceApply(); + return reduceEqualsQuery(); case 94: - return reduceSymbol(); + return reduceBindQuery(); case 95: - return reduceEscapedId(); + return reduceCompositeQuery(); case 96: - return reduceMinus(); + return reduceApply(); case 97: - return reduceLess(); + return reduceSymbol(); case 98: - return reduceGreater(); + return reduceEscapedId(); case 99: - return reduceDot(); + return reduceMinus(); case 100: - return reduceFieldAccess(); + return reduceLess(); case 101: - return reduceIdAccessor(); + return reduceGreater(); case 102: - return reduceStringAccessor(); + return reduceDoubleLess(); case 103: - return reduceExpAccessor(); + return reduceDoubleGreater(); case 104: - return reduceCase(); + return reduceDot(); case 105: - return reduceStringLiteral(); + return reduceFieldAccess(); case 106: - return reduceSymbol(); + return reduceIdAccessor(); case 107: - return reduceEscapedId(); + return reduceStringAccessor(); case 108: - return reduceLess(); + return reduceExpAccessor(); case 109: - return reduceGreater(); + return reduceCase(); case 110: - return reduceDot(); + return reduceQueryBlock(); case 111: - return reduceGuardQualifier(); + return reduceVerboseCHRConjunction(); case 112: - return reduceLetQualifier(); + return reduceStringLiteral(); case 113: - return reduceBindQualifier(); + return reduceSymbol(); case 114: - return reduceThenQualifier(); + return reduceEscapedId(); case 115: - return reduceCHRQuery(); + return reduceLess(); case 116: - return reduceVerboseCHRQuery(); + return reduceGreater(); case 117: - return reduceSimpleCaseRhs(); + return reduceDot(); case 118: - return reduceGuardedCaseRhs(); + return reduceGuardQualifier(); case 119: - return reduceGuardedExpArrow(); + return reduceLetQualifier(); case 120: - return reduceGuardEquation(); + return reduceBindQualifier(); case 121: - return reduceBasicEquation(); + return reduceThenQualifier(); case 122: - return reduceEffect(); + return reduceCHRConjunction(); case 123: - return reduceJustEtype(); + return reduceCHRAtom(); case 124: - return reduceForAll(); + return reduceCHREquals(); case 125: - return reduceApplyType(); + return reduceCHRBinds(); case 126: + return reduceSimpleCaseRhs(); + case 127: + return reduceGuardedCaseRhs(); + case 128: + return reduceGuardedExpArrow(); + case 129: + return reduceGuardEquation(); + case 130: + return reduceBasicEquation(); + case 131: + return reduceEffect(); + case 132: + return reduceJustEtype(); + case 133: + return reduceForAll(); + case 134: + return reduceApplyType(); + case 135: return reduceDummy(); default: @@ -709,10 +733,6 @@ public abstract class SCLParser { * exp ::= bexp (HASTYPE type)? */ protected abstract Object reduceLocalTypeAnnotation(); - /** - * exp ::= bexp COLON ID (queryBlock | WITH queryBlock?)? - */ - protected abstract Object reduceEntityTypeAnnotation(); /** * equationBlock ::= (equation (SEMICOLON equation)*)? */ @@ -785,6 +805,10 @@ public abstract class SCLParser { * declaration ::= bexp FOLLOWS ruleDeclarations */ protected abstract Object reduceRelationDefinition(); + /** + * declaration ::= RULESET ID WHERE statements + */ + protected abstract Object reduceRulesetDefinition(); /** * command ::= statement */ @@ -818,9 +842,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 */ @@ -833,6 +861,10 @@ public abstract class SCLParser { * field ::= ID */ protected abstract Object reduceFieldShorthand(); + /** + * field ::= DOTDOT + */ + protected abstract Object reduceWildcard(); /** * var ::= ID */ @@ -877,6 +909,10 @@ public abstract class SCLParser { * atype ::= ID */ protected abstract Object reduceTypeVar(); + /** + * atype ::= DOUBLE_LESS ID (COMMA ID)* DOUBLE_GREATER + */ + protected abstract Object reducePlainEffect(); /** * atype ::= LPAREN (type (COMMA (type COMMA)* type)?)? RPAREN */ @@ -914,13 +950,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 */ @@ -1001,6 +1041,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 */ @@ -1017,10 +1061,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 */ @@ -1049,10 +1089,6 @@ public abstract class SCLParser { * query ::= QUERY_OP queryBlock */ protected abstract Object reduceCompositeQuery(); - /** - * queryBlock ::= LBRACE (query (SEMICOLON (query SEMICOLON)* query)?)? RBRACE - */ - protected abstract Object reduceQueryBlock(); /** * lexp ::= faexp faexp* */ @@ -1077,6 +1113,14 @@ public abstract class SCLParser { * symbol ::= GREATER */ protected abstract Object reduceGreater(); + /** + * symbol ::= DOUBLE_LESS + */ + protected abstract Object reduceDoubleLess(); + /** + * symbol ::= DOUBLE_GREATER + */ + protected abstract Object reduceDoubleGreater(); /** * symbol ::= SEPARATED_DOT */ @@ -1101,6 +1145,14 @@ public abstract class SCLParser { * case ::= exp caseRhs */ protected abstract Object reduceCase(); + /** + * 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 */ @@ -1122,13 +1174,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)? */