From e1d6802843960e911f19c7e9c4a4b626ae854b90 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Mon, 11 Oct 2021 01:42:22 +0200
Subject: feat(web): simplify contextual parsing

* More relaxted parsing in the browser for stable variable/node
  identifier classification.
* String support in the browser.
* contains, refers, and opposite keywords are no longer contextual,
  which simplifies parsing in the browser.
---
 language-web/src/main/js/editor/EditorParent.ts    |  3 +++
 language-web/src/main/js/editor/problem.grammar    | 23 +++++++++++++++-------
 .../src/main/js/editor/problemLanguageSupport.ts   |  3 ++-
 language-web/src/main/js/index.tsx                 |  2 +-
 4 files changed, 22 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 316c5072..a2f6c266 100644
--- a/language-web/src/main/js/editor/EditorParent.ts
+++ b/language-web/src/main/js/editor/EditorParent.ts
@@ -65,6 +65,9 @@ export const EditorParent = styled('div')(({ theme }) => ({
   '.cmt-number': {
     color: '#6188a6',
   },
+  '.cmt-string': {
+    color: theme.palette.secondary.dark,
+  },
   '.cmt-keyword': {
     color: theme.palette.primary.main,
   },
diff --git a/language-web/src/main/js/editor/problem.grammar b/language-web/src/main/js/editor/problem.grammar
index 921cec53..cf940698 100644
--- a/language-web/src/main/js/editor/problem.grammar
+++ b/language-web/src/main/js/editor/problem.grammar
@@ -1,4 +1,3 @@
-
 @top Problem { statement* }
 
 statement {
@@ -7,6 +6,7 @@ statement {
   } |
   ClassDefinition {
     ckw<"abstract">? ckw<"class"> RelationName
+    (ckw<"extends"> sep<",", RelationName>)?
     (ClassBody {  "{" ReferenceDeclaration* "}" } | ".")
   } |
   EnumDefinition {
@@ -21,6 +21,9 @@ statement {
     ckw<"default">? (NotOp | UnknownOp)? RelationName
     ParameterList<AssertionArgument> (":" LogicValue)? "."
   } |
+  NodeValueAssertion {
+    UniqueNodeName ":" Constant "."
+  } |
   UniqueDeclaration {
     ckw<"unique"> sep<",", UniqueNodeName> "."
   } |
@@ -30,18 +33,17 @@ statement {
 }
 
 ReferenceDeclaration {
-  ((kw<"refers"> | kw<"contains">) !times RelationName | !plus RelationName)
+  (kw<"refers"> | kw<"contains">)?
+  RelationName
   RelationName
   ( "[" Multiplicity? "]" )?
   (kw<"opposite"> RelationName)?
   ";"?
 }
 
-@precedence { times @left, plus }
-
 Parameter { RelationName? VariableName }
 
-Conjunction { sep1<",", Literal> }
+Conjunction { ("," | Literal)+ }
 
 OrOp { ";" }
 
@@ -49,9 +51,11 @@ Literal { NotOp? Atom }
 
 Atom { RelationName ParameterList<Argument>? }
 
-Argument { VariableName | Real }
+Argument { VariableName | Constant }
 
-AssertionArgument { NodeName | StarArgument | Real }
+AssertionArgument { NodeName | StarArgument | Constant }
+
+Constant { Real | String }
 
 LogicValue {
   ckw<"true"> | ckw<"false"> | ckw<"unknown"> | ckw<"error">
@@ -108,6 +112,11 @@ sep1<separator, content> { content (separator content?)* }
 
   exponential { int ("e" | "E") ("+" | "-")? int }
 
+  String {
+    "'" (![\\'\n] | "\\" ![\n] | "\\\n")+ "'" |
+    "\"" (![\\"\n] | "\\" (![\n] | "\n"))* "\""
+  }
+
   NotOp { "!" }
 
   UnknownOp { "?" }
diff --git a/language-web/src/main/js/editor/problemLanguageSupport.ts b/language-web/src/main/js/editor/problemLanguageSupport.ts
index 2bf7c7a4..c9e61b31 100644
--- a/language-web/src/main/js/editor/problemLanguageSupport.ts
+++ b/language-web/src/main/js/editor/problemLanguageSupport.ts
@@ -26,7 +26,7 @@ const parserWithMetadata = (parser as LRParser).configure({
       LineComment: t.lineComment,
       BlockComment: t.blockComment,
       'problem class enum pred unique scope': t.definitionKeyword,
-      'abstract refers contains opposite error default': t.modifier,
+      'abstract extends refers contains opposite error default': t.modifier,
       'true false unknown error': t.keyword,
       NotOp: t.keyword,
       UnknownOp: t.keyword,
@@ -34,6 +34,7 @@ const parserWithMetadata = (parser as LRParser).configure({
       StarArgument: t.keyword,
       'IntMult StarMult Real': t.number,
       StarMult: t.number,
+      String: t.string,
       'RelationName/QualifiedName': t.typeName,
       'UniqueNodeName/QualifiedName': t.atom,
       'VariableName/QualifiedName': t.variableName,
diff --git a/language-web/src/main/js/index.tsx b/language-web/src/main/js/index.tsx
index 1b24eadb..9316db4d 100644
--- a/language-web/src/main/js/index.tsx
+++ b/language-web/src/main/js/index.tsx
@@ -26,7 +26,7 @@ enum TaxStatus {
 % A child cannot have any dependents.
 error invalidTaxStatus(Person p) <->
   taxStatus(p, child),
-  children(p, _q)
+  children(p, _q),
 ; taxStatus(p, retired),
   parent(p, q),
   !taxStatus(q, retired).
-- 
cgit v1.2.3-54-g00ecf