aboutsummaryrefslogtreecommitdiffstats
path: root/language-web/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'language-web/src/main')
-rw-r--r--language-web/src/main/js/editor/EditorParent.ts2
-rw-r--r--language-web/src/main/js/index.tsx2
-rw-r--r--language-web/src/main/js/language/problem.grammar10
-rw-r--r--language-web/src/main/js/language/problemLanguageSupport.ts4
4 files changed, 9 insertions, 9 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
41unique family. 41individual family.
42Family(family). 42Family(family).
43members(family, anne). 43members(family, anne).
44members(family, bob). 44members(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
88RuleName { QualifiedName } 88RuleName { QualifiedName }
89 89
90UniqueNodeName { QualifiedName } 90IndividualNodeName { QualifiedName }
91 91
92VariableName { QualifiedName } 92VariableName { 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,