From f0ad5f232acf41c421ec164fb3cf097ef93214ff Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Wed, 10 Aug 2022 18:07:00 +0200 Subject: refactor(language): simplify count notation Also change refinement operator based on feedback from colleagues --- .../language/src/main/java/tools/refinery/language/Problem.xtext | 8 ++++---- .../src/main/resources/tools/refinery/language/builtin.problem | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'subprojects/language/src') 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 93d066af..74b0d50e 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext +++ b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext @@ -64,23 +64,23 @@ NegativeLiteral: modality=Modality? "!" atom=Atom; enum ComparisonOp: - LESS="<" | LESS_EQ="<=" | GREATER=">" | GREATER_EQ=">=" | EQ="=:=" | NOT_EQ="=!=" ; + LESS="<" | LESS_EQ="<=" | GREATER=">" | GREATER_EQ=">=" | EQ="=="; CountLiteral: - modality=Modality? "count" "{" atom=Atom "}" op=ComparisonOp threshold=INT; + modality=Modality? "count" atom=Atom op=ComparisonOp threshold=INT; Action: AssertionAction | DeleteAction | NewAction; AssertionAction: value=ShortLogicValue? atom=Atom | - atom=Atom (overwrite?="=" | ":") value=LogicValue; + atom=Atom (overwrite?=":=" | "<:") value=LogicValue; DeleteAction: "delete" variableOrNode=[VariableOrNode|QualifiedName]; NewAction: - "new" variable=NewVariable (":" parent=[VariableOrNode|QualifiedName])?; + "new" variable=NewVariable ("<:" parent=[VariableOrNode|QualifiedName])?; NewVariable: name=Identifier; diff --git a/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem b/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem index 5e913b51..323e03f1 100644 --- a/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem +++ b/subprojects/language/src/main/resources/tools/refinery/language/builtin.problem @@ -1,7 +1,7 @@ problem builtin. abstract class node { - refers node[] equals opposite equals. + refers node[] equals opposite equals } pred exists(node node). -- cgit v1.2.3-54-g00ecf