chore(lang): shorten keyword individual -> indiv

11 files changed, 14 insertions, 14 deletions

diff --git a/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend b/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend
index add73c87..b2fcbaa9 100644
--- a/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend
+++ b/language-to-store/src/test/java/tools/refinery/language/mapping/tests/PartialModelMapperTest.xtend
@@ -290,7 +290,7 @@ class PartialModelMapperTest {
                         error invalidTaxStatus(Person p) <->
                                 taxStatus(p, child), children(p, _q).
                         
-                        individual family.
+                        indiv family.
                         Family(family).
                         members(family, anne): true.
                         members(family, bob).
diff --git a/language-web/src/main/js/index.tsx b/language-web/src/main/js/index.tsx
index 3e077ba8..d368c9ba 100644
--- a/language-web/src/main/js/index.tsx
+++ b/language-web/src/main/js/index.tsx
@@ -38,7 +38,7 @@ direct rule createChild(p):
     children(p, q) = true,
     taxStatus(q, child) = true.
 
-individual family.
+indiv family.
 Family(family).
 members(family, anne).
 members(family, bob).
diff --git a/language-web/src/main/js/language/problem.grammar b/language-web/src/main/js/language/problem.grammar
index 0cbfa831..bccc2e31 100644
--- a/language-web/src/main/js/language/problem.grammar
+++ b/language-web/src/main/js/language/problem.grammar
@@ -35,7 +35,7 @@ statement {
     IndividualNodeName ":" Constant "."
   } |
   IndividualDeclaration {
-    ckw<"individual"> sep<",", IndividualNodeName> "."
+    ckw<"indiv"> sep<",", IndividualNodeName> "."
   } |
   ScopeDeclaration {
     kw<"scope"> sep<",", ScopeElement> "."
diff --git a/language-web/src/main/js/language/problemLanguageSupport.ts b/language-web/src/main/js/language/problemLanguageSupport.ts
index 1dba3447..6508a2c0 100644
--- a/language-web/src/main/js/language/problemLanguageSupport.ts
+++ b/language-web/src/main/js/language/problemLanguageSupport.ts
@@ -27,7 +27,7 @@ const parserWithMetadata = (parser as LRParser).configure({
     styleTags({
       LineComment: t.lineComment,
       BlockComment: t.blockComment,
-      'problem class enum pred rule individual scope': t.definitionKeyword,
+      'problem class enum pred rule indiv scope': t.definitionKeyword,
       'abstract extends refers contains opposite error direct default': t.modifier,
       'true false unknown error': t.keyword,
       'new delete': t.operatorKeyword,
diff --git a/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
index d34a1610..a26ce040 100644
--- a/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
+++ b/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
@@ -96,7 +96,7 @@ class ProblemWebSocketServletIntegrationTest {
                         case 0 -> session.getRemote().sendString(
                                         "{\"id\":\"foo\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"fullText\":\"class Person.\n\"}}");
                         case 3 -> session.getRemote().sendString(
-                                        "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"individual q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}");
+                                        "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"indiv q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}");
                         case 5 -> session.close();
                         }
                 }
diff --git a/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java b/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
index 3229597e..5b8fedba 100644
--- a/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
+++ b/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
@@ -92,7 +92,7 @@ class TransactionExecutorTest {
                 var stateId = updateFullText();
                 var responseHandler = sendRequestAndWaitForAllResponses(
                                 new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId",
-                                                stateId, "deltaText", "individual q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0")));
+                                                stateId, "deltaText", "indiv q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0")));
 
                 var captor = newCaptor();
                 verify(responseHandler, times(2)).onResponse(captor.capture());
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:
         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);
diff --git a/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend b/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend
index 9e357529..53d31a6c 100644
--- a/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend
+++ b/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend
@@ -46,7 +46,7 @@ class ProblemParsingTest {
                         error invalidTaxStatus(Person p) <->
                                 taxStatus(p, child), children(p, _q).
                         
-                        individual family.
+                        indiv family.
                         Family(family).
                         members(family, anne): true.
                         members(family, bob).
diff --git a/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend b/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend
index 5f669847..3a046341 100644
--- a/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend
+++ b/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend
@@ -81,7 +81,7 @@ class NodeScopingTest {
         def void individualNodeInAssertionTest(String qualifiedNamePrefix, boolean namedProblem) {
                 val it = parseHelper.parse('''
                         «IF namedProblem»problem test.«ENDIF»
-                        individual a, b.
+                        indiv a, b.
                         pred predicate(node x, node y) <-> node(x).
                         predicate(«qualifiedNamePrefix»a, «qualifiedNamePrefix»a).
                         ?predicate(«qualifiedNamePrefix»a, «qualifiedNamePrefix»b).
@@ -99,7 +99,7 @@ class NodeScopingTest {
         def void individualNodeInNodeValueAssertionTest(String qualifiedNamePrefix, boolean namedProblem) {
                 val it = parseHelper.parse('''
                         «IF namedProblem»problem test.«ENDIF»
-                        individual a.
+                        indiv a.
                         «qualifiedNamePrefix»a: 16.
                 ''')
                 assertThat(errors, empty)
@@ -112,7 +112,7 @@ class NodeScopingTest {
         def void individualNodeInPredicateTest(String qualifiedNamePrefix, boolean namedProblem) {
                 val it = parseHelper.parse('''
                         «IF namedProblem»problem test.«ENDIF»
-                        individual b.
+                        indiv b.
                         pred predicate(node a) <-> node(«qualifiedNamePrefix»b).
                 ''')
                 assertThat(errors, empty)
diff --git a/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java b/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java
index 34c1d14b..303da50f 100644
--- a/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java
+++ b/language/src/test/java/tools/refinery/language/tests/serializer/ProblemSerializerTest.java
@@ -74,7 +74,7 @@ public class ProblemSerializerTest {
                 problem.getStatements().add(individualDeclaration);
                 createAssertion(pred, node);
 
-                assertSerializedResult("pred foo ( node p ) . individual a . foo ( a ) : true .");
+                assertSerializedResult("pred foo ( node p ) . indiv a . foo ( a ) : true .");
         }
 
         private PredicateDefinition createPred() {