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=527c66f5dc0b86e78988c8cf83b5e3e23970078a;hpb=fad36d463b75c3a9944d875fc627c3533f6da74d;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 527c66f5d..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 = 353; - private static final int TERMINAL_COUNT = 84; - private static final int NONTERMINAL_COUNT = 51; - private static final int PRODUCT_COUNT = 134; + 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[6588]; - private static final int[] ERROR_TABLE = new int[927]; + 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[1620]; + 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", @@ -116,6 +118,8 @@ public abstract class SCLParser { "BY", "QUERY_OP", "FORALL", + "DOUBLE_LESS", + "DOUBLE_GREATER", "COMMENT", "EOL", "EOF" @@ -156,11 +160,12 @@ public abstract class SCLParser { "accessor", "case", "queryBlock", + "verboseChrQuery", "stringLiteral", "symbolWithoutMinus", "listQualifier", "chrQuery", - "verboseChrQuery", + "chrQueryPart", "caseRhs", "guardedExpArrow", "equation", @@ -394,19 +399,19 @@ public abstract class SCLParser { return parse(0); } public Object parseCommands() { - return parse(337); + return parse(352); } public Object parseImport() { - return parse(345); + return parse(360); } public Object parseType() { - return parse(347); + return parse(362); } public Object parseExp() { - return parse(349); + return parse(364); } public Object parseEquationBlock() { - return parse(351); + return parse(366); } @@ -490,184 +495,200 @@ 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 reducePlainEffect(); case 51: - return reduceListTypeConstructor(); + return reduceTupleType(); case 52: - return reduceTupleTypeConstructor(); + return reduceListType(); case 53: - return reduceLambda(); + return reduceListTypeConstructor(); case 54: - return reduceLambdaMatch(); + return reduceTupleTypeConstructor(); case 55: - return reduceLet(); + return reduceLambda(); case 56: - return reduceIf(); + return reduceLambdaMatch(); case 57: - return reduceMatch(); + return reduceLet(); case 58: - return reduceDo(); + return reduceIf(); case 59: - return reduceSelect(); + return reduceMatch(); case 60: - return reduceEnforce(); + return reduceDo(); case 61: - return reduceVar(); + return reduceSelect(); case 62: - return reduceHashedId(); + return reduceCHRSelect(); case 63: - return reduceBlank(); + return reduceEnforce(); case 64: - return reduceInteger(); + return reduceVar(); case 65: - return reduceFloat(); + return reduceHashedId(); case 66: - return reduceString(); + return reduceBlank(); case 67: - return reduceChar(); + return reduceInteger(); case 68: - return reduceTuple(); + return reduceFloat(); case 69: - return reduceViewPattern(); + return reduceString(); case 70: - return reduceRightSection(); + return reduceChar(); case 71: - return reduceLeftSection(); + return reduceTuple(); case 72: - return reduceListLiteral(); + return reduceViewPattern(); case 73: - return reduceRange(); + return reduceRightSection(); case 74: - return reduceListComprehension(); + return reduceLeftSection(); case 75: - return reduceAs(); + return reduceListLiteral(); case 76: - return reduceRecord(); + return reduceRange(); case 77: - return reduceTransformation(); + return reduceListComprehension(); case 78: - return reduceEq(); + return reduceAs(); case 79: - return reduceRuleDeclarations(); + return reduceRecord(); case 80: - return reduceStatements(); + return reduceTransformation(); case 81: - return reduceImportShowing(); + return reduceEq(); case 82: - return reduceImportHiding(); + return reduceRuleDeclarations(); case 83: - return reduceImportValueItem(); + return reduceStatements(); case 84: - return reduceFieldDescription(); + return reduceImportShowing(); case 85: - return reduceGuardedExpEq(); + return reduceImportHiding(); case 86: - return reduceFundep(); + return reduceImportValueItem(); case 87: - return reduceQueryRuleDeclaration(); + return reduceFieldDescription(); case 88: - return reduceAnnotation(); + return reduceGuardedExpEq(); case 89: - return reduceGuardQuery(); + return reduceFundep(); case 90: - return reduceEqualsQuery(); + return reduceQueryRuleDeclaration(); case 91: - return reduceBindQuery(); + return reduceAnnotation(); case 92: - return reduceCompositeQuery(); + 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 reduceQueryBlock(); + return reduceFieldAccess(); case 106: - return reduceStringLiteral(); + return reduceIdAccessor(); case 107: - return reduceSymbol(); + return reduceStringAccessor(); case 108: - return reduceEscapedId(); + return reduceExpAccessor(); case 109: - return reduceLess(); + return reduceCase(); case 110: - return reduceGreater(); + return reduceQueryBlock(); case 111: - return reduceDot(); + return reduceVerboseCHRConjunction(); case 112: - return reduceGuardQualifier(); + return reduceStringLiteral(); case 113: - return reduceLetQualifier(); + return reduceSymbol(); case 114: - return reduceBindQualifier(); + return reduceEscapedId(); case 115: - return reduceThenQualifier(); + return reduceLess(); case 116: - return reduceCHRQuery(); + return reduceGreater(); case 117: - return reduceVerboseCHRQuery(); + return reduceDot(); case 118: - return reduceSimpleCaseRhs(); + return reduceGuardQualifier(); case 119: - return reduceGuardedCaseRhs(); + return reduceLetQualifier(); case 120: - return reduceGuardedExpArrow(); + return reduceBindQualifier(); case 121: - return reduceGuardEquation(); + return reduceThenQualifier(); case 122: - return reduceBasicEquation(); + return reduceCHRConjunction(); case 123: - return reduceEffect(); + return reduceCHRAtom(); case 124: - return reduceJustEtype(); + return reduceCHREquals(); case 125: - return reduceForAll(); + return reduceCHRBinds(); case 126: - return reduceApplyType(); + 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: @@ -821,7 +842,7 @@ public abstract class SCLParser { */ protected abstract Object reduceVerboseCHRStatement(); /** - * statement ::= CONSTRAINT ID atype* + * statement ::= CONSTRAINT constructor */ protected abstract Object reduceConstraintStatement(); /** @@ -840,6 +861,10 @@ public abstract class SCLParser { * field ::= ID */ protected abstract Object reduceFieldShorthand(); + /** + * field ::= DOTDOT + */ + protected abstract Object reduceWildcard(); /** * var ::= ID */ @@ -884,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 */ @@ -921,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 */ @@ -1080,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 */ @@ -1108,6 +1149,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 */ @@ -1129,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)? */