From d77406349cf792823bd093332c1ca4d6e7a1091a Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 30 Jun 2024 14:12:45 +0200 Subject: refactor(language): move computed to Atom --- .../language/src/main/java/tools/refinery/language/Problem.xtext | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'subprojects/language/src/main/java/tools') diff --git a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext index df33cfa6..d6c605cc 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext +++ b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext @@ -92,7 +92,7 @@ enum ParameterBinding: Parameter: ( - (derivation=Derivation? concreteness=Concreteness? modality=Modality)? + (concreteness=Concreteness? modality=Modality)? parameterType=[Relation|QualifiedName] )? binding=ParameterBinding? name=Identifier; @@ -182,9 +182,6 @@ AggregationExpr: aggregator=[AggregatorDeclaration|QualifiedName] "{" value=Expr "|" condition=ComparisonExpr "}"; -enum Derivation: - COMPUTED="computed"; - enum Concreteness: CANDIDATE="candidate"; @@ -192,7 +189,6 @@ enum Modality: MUST="must" | MAY="may"; ModalExpr: - derivation=Derivation? concreteness=Concreteness? modality=Modality body=UnaryExpr; @@ -203,6 +199,7 @@ CastExprBody returns Expr: Atom | VariableOrNodeExpr | Constant | "(" Expr ")"; Atom: + computed?="computed"? relation=[Relation|QualifiedName] transitiveClosure?=TRANSITIVE_CLOSURE? "(" (arguments+=Expr ("," arguments+=Expr)*)? ")"; -- cgit v1.2.3-70-g09d2