Merge pull request #12 from kris7t/xtext-serialization

Make sure Xtext serialization works

2 files changed, 8 insertions, 8 deletions

diff --git a/language/src/main/java/tools/refinery/language/Problem.xtext b/language/src/main/java/tools/refinery/language/Problem.xtext
index b7562759..26773047 100644
--- a/language/src/main/java/tools/refinery/language/Problem.xtext
+++ b/language/src/main/java/tools/refinery/language/Problem.xtext
@@ -109,12 +109,12 @@ ConstantArgument:
 
 Assertion:
         default?="default"?
-        (relation=[Relation|QualifiedName]
-        "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
-        ":" value=LogicValue |
-        value=ShortLogicValue?
+        (value=ShortLogicValue?
         relation=[Relation|QualifiedName]
-        "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")")
+        "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
+        | relation=[Relation|QualifiedName]
+        "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
+        ":" value=LogicValue)
         ".";
 
 AssertionArgument:
@@ -174,7 +174,7 @@ ExactMultiplicity:
         exactValue=INT;
 
 IndividualDeclaration:
-        "individual" nodes+=EnumLiteral ("," nodes+=EnumLiteral)* ".";
+        "indiv" nodes+=EnumLiteral ("," nodes+=EnumLiteral)* ".";
 
 UpperBound returns ecore::EInt:
         INT | "*";
@@ -184,7 +184,7 @@ QualifiedName hidden():
 
 Identifier:
         ID | "true" | "false" | "unknown" | "error" | "class" | "abstract" | "extends" | "enum" | "pred" |
-        "individual" | "problem" | "new" | "delete" | "direct" | "rule";
+        "indiv" | "problem" | "new" | "delete" | "direct" | "rule";
 
 Integer returns ecore::EInt hidden():
         "-"? INT;
diff --git a/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java b/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
index 3c10d39e..975fdca2 100644
--- a/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
+++ b/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java
@@ -53,7 +53,7 @@ public class ProblemValidator extends AbstractProblemValidator {
                 var variableOrNode = argument.getVariableOrNode();
                 if (variableOrNode instanceof Node node && !ProblemUtil.isIndividualNode(node)) {
                         var name = node.getName();
-                        var message = "Only individual nodes can be referenced in predicates. Mark '%s' as individual with the declaration 'individual %s.'"
+                        var message = "Only individual nodes can be referenced in predicates. Mark '%s' as individual with the declaration 'indiv %s.'"
                                         .formatted(name, name);
                         error(message, argument, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE,
                                         INSIGNIFICANT_INDEX, NON_INDIVIDUAL_NODE_ISSUE);