From a951628de0ce9902222ed290a1345c145f8af01a Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Fri, 5 Nov 2021 19:33:25 +0100
Subject: chore: rename unique to individual

Suggestion by @vincemolnar to match SysML V2 terminology more closely.
---
 language-web/src/main/js/editor/EditorParent.ts             |  2 +-
 language-web/src/main/js/index.tsx                          |  2 +-
 language-web/src/main/js/language/problem.grammar           | 10 +++++-----
 language-web/src/main/js/language/problemLanguageSupport.ts |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'language-web/src/main/js')

diff --git a/language-web/src/main/js/editor/EditorParent.ts b/language-web/src/main/js/editor/EditorParent.ts
index 2d74b863..94ca24ea 100644
--- a/language-web/src/main/js/editor/EditorParent.ts
+++ b/language-web/src/main/js/editor/EditorParent.ts
@@ -143,7 +143,7 @@ export const EditorParent = styled('div')(({ theme }) => {
         color: theme.palette.text.secondary,
       },
     },
-    '.cmt-problem-unique': {
+    '.cmt-problem-individual': {
       '&, & .cmt-variableName': {
         color: theme.palette.text.primary,
       },
diff --git a/language-web/src/main/js/index.tsx b/language-web/src/main/js/index.tsx
index dfecde37..3e077ba8 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.
 
-unique family.
+individual 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 8e39243f..0cbfa831 100644
--- a/language-web/src/main/js/language/problem.grammar
+++ b/language-web/src/main/js/language/problem.grammar
@@ -15,7 +15,7 @@ statement {
   } |
   EnumDefinition {
     ckw<"enum"> RelationName
-    (EnumBody { "{" sep<",", UniqueNodeName> "}" } | ".")
+    (EnumBody { "{" sep<",", IndividualNodeName> "}" } | ".")
   } |
   PredicateDefinition {
     (ckw<"error"> ckw<"pred">? | ckw<"direct">? ckw<"pred">)
@@ -32,10 +32,10 @@ statement {
     ParameterList<AssertionArgument> (":" LogicValue)? "."
   } |
   NodeValueAssertion {
-    UniqueNodeName ":" Constant "."
+    IndividualNodeName ":" Constant "."
   } |
-  UniqueDeclaration {
-    ckw<"unique"> sep<",", UniqueNodeName> "."
+  IndividualDeclaration {
+    ckw<"individual"> sep<",", IndividualNodeName> "."
   } |
   ScopeDeclaration {
     kw<"scope"> sep<",", ScopeElement> "."
@@ -87,7 +87,7 @@ RelationName { QualifiedName }
 
 RuleName { QualifiedName }
 
-UniqueNodeName { QualifiedName }
+IndividualNodeName { QualifiedName }
 
 VariableName { QualifiedName }
 
diff --git a/language-web/src/main/js/language/problemLanguageSupport.ts b/language-web/src/main/js/language/problemLanguageSupport.ts
index ab1c55f9..1dba3447 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 unique scope': t.definitionKeyword,
+      'problem class enum pred rule individual scope': t.definitionKeyword,
       'abstract extends refers contains opposite error direct default': t.modifier,
       'true false unknown error': t.keyword,
       'new delete': t.operatorKeyword,
@@ -40,7 +40,7 @@ const parserWithMetadata = (parser as LRParser).configure({
       String: t.string,
       'RelationName/QualifiedName': t.typeName,
       'RuleName/QualifiedName': t.macroName,
-      'UniqueNodeName/QualifiedName': t.atom,
+      'IndividualNodeName/QualifiedName': t.atom,
       'VariableName/QualifiedName': t.variableName,
       '{ }': t.brace,
       '( )': t.paren,
-- 
cgit v1.2.3-54-g00ecf