refactor(language): simplify count notation

Also change refinement operator based on feedback from colleagues

1 files changed, 4 insertions, 4 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 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;