From a951628de0ce9902222ed290a1345c145f8af01a Mon Sep 17 00:00:00 2001 From: Kristóf Marussy 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 ++-- .../language/web/ProblemWebSocketServletIntegrationTest.java | 2 +- .../language/web/xtext/servlet/TransactionExecutorTest.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'language-web') 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 (":" 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, 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 d42cc15c..d34a1610 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\":\"unique q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}"); + "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"individual 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 975d120c..3229597e 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 @@ -79,7 +79,7 @@ class TransactionExecutorTest { var stateId = updateFullText(); var responseHandler = sendRequestAndWaitForAllResponses( new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", - stateId, "deltaText", "unique q.\nnode(q).\n\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); + stateId, "deltaText", "individual q.\nnode(q).\n\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); var captor = newCaptor(); verify(responseHandler, times(3)).onResponse(captor.capture()); @@ -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", "unique q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); + stateId, "deltaText", "individual q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); var captor = newCaptor(); verify(responseHandler, times(2)).onResponse(captor.capture()); -- cgit v1.2.3-54-g00ecf