diff options
Diffstat (limited to 'language-web/src')
6 files changed, 12 insertions, 12 deletions
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 }) => { | |||
143 | color: theme.palette.text.secondary, | 143 | color: theme.palette.text.secondary, |
144 | }, | 144 | }, |
145 | }, | 145 | }, |
146 | '.cmt-problem-unique': { | 146 | '.cmt-problem-individual': { |
147 | '&, & .cmt-variableName': { | 147 | '&, & .cmt-variableName': { |
148 | color: theme.palette.text.primary, | 148 | color: theme.palette.text.primary, |
149 | }, | 149 | }, |
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): | |||
38 | children(p, q) = true, | 38 | children(p, q) = true, |
39 | taxStatus(q, child) = true. | 39 | taxStatus(q, child) = true. |
40 | 40 | ||
41 | unique family. | 41 | individual family. |
42 | Family(family). | 42 | Family(family). |
43 | members(family, anne). | 43 | members(family, anne). |
44 | members(family, bob). | 44 | 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 { | |||
15 | } | | 15 | } | |
16 | EnumDefinition { | 16 | EnumDefinition { |
17 | ckw<"enum"> RelationName | 17 | ckw<"enum"> RelationName |
18 | (EnumBody { "{" sep<",", UniqueNodeName> "}" } | ".") | 18 | (EnumBody { "{" sep<",", IndividualNodeName> "}" } | ".") |
19 | } | | 19 | } | |
20 | PredicateDefinition { | 20 | PredicateDefinition { |
21 | (ckw<"error"> ckw<"pred">? | ckw<"direct">? ckw<"pred">) | 21 | (ckw<"error"> ckw<"pred">? | ckw<"direct">? ckw<"pred">) |
@@ -32,10 +32,10 @@ statement { | |||
32 | ParameterList<AssertionArgument> (":" LogicValue)? "." | 32 | ParameterList<AssertionArgument> (":" LogicValue)? "." |
33 | } | | 33 | } | |
34 | NodeValueAssertion { | 34 | NodeValueAssertion { |
35 | UniqueNodeName ":" Constant "." | 35 | IndividualNodeName ":" Constant "." |
36 | } | | 36 | } | |
37 | UniqueDeclaration { | 37 | IndividualDeclaration { |
38 | ckw<"unique"> sep<",", UniqueNodeName> "." | 38 | ckw<"individual"> sep<",", IndividualNodeName> "." |
39 | } | | 39 | } | |
40 | ScopeDeclaration { | 40 | ScopeDeclaration { |
41 | kw<"scope"> sep<",", ScopeElement> "." | 41 | kw<"scope"> sep<",", ScopeElement> "." |
@@ -87,7 +87,7 @@ RelationName { QualifiedName } | |||
87 | 87 | ||
88 | RuleName { QualifiedName } | 88 | RuleName { QualifiedName } |
89 | 89 | ||
90 | UniqueNodeName { QualifiedName } | 90 | IndividualNodeName { QualifiedName } |
91 | 91 | ||
92 | VariableName { QualifiedName } | 92 | VariableName { QualifiedName } |
93 | 93 | ||
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({ | |||
27 | styleTags({ | 27 | styleTags({ |
28 | LineComment: t.lineComment, | 28 | LineComment: t.lineComment, |
29 | BlockComment: t.blockComment, | 29 | BlockComment: t.blockComment, |
30 | 'problem class enum pred rule unique scope': t.definitionKeyword, | 30 | 'problem class enum pred rule individual scope': t.definitionKeyword, |
31 | 'abstract extends refers contains opposite error direct default': t.modifier, | 31 | 'abstract extends refers contains opposite error direct default': t.modifier, |
32 | 'true false unknown error': t.keyword, | 32 | 'true false unknown error': t.keyword, |
33 | 'new delete': t.operatorKeyword, | 33 | 'new delete': t.operatorKeyword, |
@@ -40,7 +40,7 @@ const parserWithMetadata = (parser as LRParser).configure({ | |||
40 | String: t.string, | 40 | String: t.string, |
41 | 'RelationName/QualifiedName': t.typeName, | 41 | 'RelationName/QualifiedName': t.typeName, |
42 | 'RuleName/QualifiedName': t.macroName, | 42 | 'RuleName/QualifiedName': t.macroName, |
43 | 'UniqueNodeName/QualifiedName': t.atom, | 43 | 'IndividualNodeName/QualifiedName': t.atom, |
44 | 'VariableName/QualifiedName': t.variableName, | 44 | 'VariableName/QualifiedName': t.variableName, |
45 | '{ }': t.brace, | 45 | '{ }': t.brace, |
46 | '( )': t.paren, | 46 | '( )': 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 { | |||
96 | case 0 -> session.getRemote().sendString( | 96 | case 0 -> session.getRemote().sendString( |
97 | "{\"id\":\"foo\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"fullText\":\"class Person.\n\"}}"); | 97 | "{\"id\":\"foo\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"fullText\":\"class Person.\n\"}}"); |
98 | case 3 -> session.getRemote().sendString( | 98 | case 3 -> session.getRemote().sendString( |
99 | "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"unique q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}"); | 99 | "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"individual q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}"); |
100 | case 5 -> session.close(); | 100 | case 5 -> session.close(); |
101 | } | 101 | } |
102 | } | 102 | } |
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 { | |||
79 | var stateId = updateFullText(); | 79 | var stateId = updateFullText(); |
80 | var responseHandler = sendRequestAndWaitForAllResponses( | 80 | var responseHandler = sendRequestAndWaitForAllResponses( |
81 | new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", | 81 | new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", |
82 | stateId, "deltaText", "unique q.\nnode(q).\n<invalid text>\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); | 82 | stateId, "deltaText", "individual q.\nnode(q).\n<invalid text>\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); |
83 | 83 | ||
84 | var captor = newCaptor(); | 84 | var captor = newCaptor(); |
85 | verify(responseHandler, times(3)).onResponse(captor.capture()); | 85 | verify(responseHandler, times(3)).onResponse(captor.capture()); |
@@ -92,7 +92,7 @@ class TransactionExecutorTest { | |||
92 | var stateId = updateFullText(); | 92 | var stateId = updateFullText(); |
93 | var responseHandler = sendRequestAndWaitForAllResponses( | 93 | var responseHandler = sendRequestAndWaitForAllResponses( |
94 | new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", | 94 | new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", |
95 | stateId, "deltaText", "unique q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); | 95 | stateId, "deltaText", "individual q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); |
96 | 96 | ||
97 | var captor = newCaptor(); | 97 | var captor = newCaptor(); |
98 | verify(responseHandler, times(2)).onResponse(captor.capture()); | 98 | verify(responseHandler, times(2)).onResponse(captor.capture()); |