diff options
author | 2024-06-30 14:12:45 +0200 | |
---|---|---|
committer | 2024-06-30 20:29:21 +0200 | |
commit | d77406349cf792823bd093332c1ca4d6e7a1091a (patch) | |
tree | f4ed54e857b30d7ff2dfb9a636f86c5b598c2120 /subprojects/language/src/main/java/tools | |
parent | feat: access computed values of relations (diff) | |
download | refinery-d77406349cf792823bd093332c1ca4d6e7a1091a.tar.gz refinery-d77406349cf792823bd093332c1ca4d6e7a1091a.tar.zst refinery-d77406349cf792823bd093332c1ca4d6e7a1091a.zip |
refactor(language): move computed to Atom
Diffstat (limited to 'subprojects/language/src/main/java/tools')
-rw-r--r-- | subprojects/language/src/main/java/tools/refinery/language/Problem.xtext | 7 |
1 files changed, 2 insertions, 5 deletions
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: | |||
92 | 92 | ||
93 | Parameter: | 93 | Parameter: |
94 | ( | 94 | ( |
95 | (derivation=Derivation? concreteness=Concreteness? modality=Modality)? | 95 | (concreteness=Concreteness? modality=Modality)? |
96 | parameterType=[Relation|QualifiedName] | 96 | parameterType=[Relation|QualifiedName] |
97 | )? binding=ParameterBinding? name=Identifier; | 97 | )? binding=ParameterBinding? name=Identifier; |
98 | 98 | ||
@@ -182,9 +182,6 @@ AggregationExpr: | |||
182 | aggregator=[AggregatorDeclaration|QualifiedName] | 182 | aggregator=[AggregatorDeclaration|QualifiedName] |
183 | "{" value=Expr "|" condition=ComparisonExpr "}"; | 183 | "{" value=Expr "|" condition=ComparisonExpr "}"; |
184 | 184 | ||
185 | enum Derivation: | ||
186 | COMPUTED="computed"; | ||
187 | |||
188 | enum Concreteness: | 185 | enum Concreteness: |
189 | CANDIDATE="candidate"; | 186 | CANDIDATE="candidate"; |
190 | 187 | ||
@@ -192,7 +189,6 @@ enum Modality: | |||
192 | MUST="must" | MAY="may"; | 189 | MUST="must" | MAY="may"; |
193 | 190 | ||
194 | ModalExpr: | 191 | ModalExpr: |
195 | derivation=Derivation? | ||
196 | concreteness=Concreteness? | 192 | concreteness=Concreteness? |
197 | modality=Modality body=UnaryExpr; | 193 | modality=Modality body=UnaryExpr; |
198 | 194 | ||
@@ -203,6 +199,7 @@ CastExprBody returns Expr: | |||
203 | Atom | VariableOrNodeExpr | Constant | "(" Expr ")"; | 199 | Atom | VariableOrNodeExpr | Constant | "(" Expr ")"; |
204 | 200 | ||
205 | Atom: | 201 | Atom: |
202 | computed?="computed"? | ||
206 | relation=[Relation|QualifiedName] | 203 | relation=[Relation|QualifiedName] |
207 | transitiveClosure?=TRANSITIVE_CLOSURE? | 204 | transitiveClosure?=TRANSITIVE_CLOSURE? |
208 | "(" (arguments+=Expr ("," arguments+=Expr)*)? ")"; | 205 | "(" (arguments+=Expr ("," arguments+=Expr)*)? ")"; |