aboutsummaryrefslogtreecommitdiffstats
path: root/language/src/main
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2021-11-06 16:39:42 +0100
committerLibravatar Kristóf Marussy <kristof@marussy.com>2021-11-06 16:39:42 +0100
commit6b7075eccf7ddaccc797ffbdd855dd4b0bbad0d4 (patch)
tree013f3cc4e43ce06ff508592d4c1d7b08ef4beb0d /language/src/main
parentfix(lang): mark transient references (diff)
downloadrefinery-6b7075eccf7ddaccc797ffbdd855dd4b0bbad0d4.tar.gz
refinery-6b7075eccf7ddaccc797ffbdd855dd4b0bbad0d4.tar.zst
refinery-6b7075eccf7ddaccc797ffbdd855dd4b0bbad0d4.zip
chore(lang): shorten keyword individual -> indiv
Diffstat (limited to 'language/src/main')
-rw-r--r--language/src/main/java/tools/refinery/language/Problem.xtext4
-rw-r--r--language/src/main/java/tools/refinery/language/validation/ProblemValidator.java2
2 files changed, 3 insertions, 3 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..e2723b55 100644
--- a/language/src/main/java/tools/refinery/language/Problem.xtext
+++ b/language/src/main/java/tools/refinery/language/Problem.xtext
@@ -174,7 +174,7 @@ ExactMultiplicity:
174 exactValue=INT; 174 exactValue=INT;
175 175
176IndividualDeclaration: 176IndividualDeclaration:
177 "individual" nodes+=EnumLiteral ("," nodes+=EnumLiteral)* "."; 177 "indiv" nodes+=EnumLiteral ("," nodes+=EnumLiteral)* ".";
178 178
179UpperBound returns ecore::EInt: 179UpperBound returns ecore::EInt:
180 INT | "*"; 180 INT | "*";
@@ -184,7 +184,7 @@ QualifiedName hidden():
184 184
185Identifier: 185Identifier:
186 ID | "true" | "false" | "unknown" | "error" | "class" | "abstract" | "extends" | "enum" | "pred" | 186 ID | "true" | "false" | "unknown" | "error" | "class" | "abstract" | "extends" | "enum" | "pred" |
187 "individual" | "problem" | "new" | "delete" | "direct" | "rule"; 187 "indiv" | "problem" | "new" | "delete" | "direct" | "rule";
188 188
189Integer returns ecore::EInt hidden(): 189Integer returns ecore::EInt hidden():
190 "-"? INT; 190 "-"? 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 {
53 var variableOrNode = argument.getVariableOrNode(); 53 var variableOrNode = argument.getVariableOrNode();
54 if (variableOrNode instanceof Node node && !ProblemUtil.isIndividualNode(node)) { 54 if (variableOrNode instanceof Node node && !ProblemUtil.isIndividualNode(node)) {
55 var name = node.getName(); 55 var name = node.getName();
56 var message = "Only individual nodes can be referenced in predicates. Mark '%s' as individual with the declaration 'individual %s.'" 56 var message = "Only individual nodes can be referenced in predicates. Mark '%s' as individual with the declaration 'indiv %s.'"
57 .formatted(name, name); 57 .formatted(name, name);
58 error(message, argument, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE, 58 error(message, argument, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE,
59 INSIGNIFICANT_INDEX, NON_INDIVIDUAL_NODE_ISSUE); 59 INSIGNIFICANT_INDEX, NON_INDIVIDUAL_NODE_ISSUE);