From 1d7f4031d614ae16b53de5a84312a71346da0c9c Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Mon, 11 Oct 2021 01:13:32 +0200
Subject: chore(web): remove CodeMirror 5 MWE2 integration

CodeMirror 6 uses a hand-writter Lezer parser instead of the stream
parser generated by Xtext for CodeMirror 5.
---
 language-web/src/main/js/editor/problem.grammar | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'language-web/src')

diff --git a/language-web/src/main/js/editor/problem.grammar b/language-web/src/main/js/editor/problem.grammar
index c64402b0..921cec53 100644
--- a/language-web/src/main/js/editor/problem.grammar
+++ b/language-web/src/main/js/editor/problem.grammar
@@ -3,41 +3,42 @@
 
 statement {
   ProblemDeclaration {
-    kw<"problem"> QualifiedName "."
+    ckw<"problem"> QualifiedName "."
   } |
   ClassDefinition {
-    kw<"abstract">? kw<"class"> RelationName
+    ckw<"abstract">? ckw<"class"> RelationName
     (ClassBody {  "{" ReferenceDeclaration* "}" } | ".")
   } |
   EnumDefinition {
-    kw<"enum"> RelationName
+    ckw<"enum"> RelationName
     (EnumBody { "{" sep<",", UniqueNodeName> "}" } | ".")
   } |
   PredicateDefinition {
-    (kw<"error"> kw<"pred">? | kw<"pred">) RelationName ParameterList<Parameter>?
+    (ckw<"error"> ckw<"pred">? | ckw<"pred">) RelationName ParameterList<Parameter>?
     PredicateBody { ("<->" sep<OrOp, Conjunction>)?  "." }
   } |
   Assertion {
-    kw<"default">? (NotOp | UnknownOp)? RelationName
+    ckw<"default">? (NotOp | UnknownOp)? RelationName
     ParameterList<AssertionArgument> (":" LogicValue)? "."
   } |
   UniqueDeclaration {
-    kw<"unique"> sep<",", UniqueNodeName> "."
+    ckw<"unique"> sep<",", UniqueNodeName> "."
   } |
   ScopeDeclaration {
-    kw<"scope"> sep<",", ScopeElement> "."
+    ckw<"scope"> sep<",", ScopeElement> "."
   }
 }
 
 ReferenceDeclaration {
-  (kw<"refers"> | kw<"contains">)?
-  RelationName
+  ((kw<"refers"> | kw<"contains">) !times RelationName | !plus RelationName)
   RelationName
   ( "[" Multiplicity? "]" )?
   (kw<"opposite"> RelationName)?
   ";"?
 }
 
+@precedence { times @left, plus }
+
 Parameter { RelationName? VariableName }
 
 Conjunction { sep1<",", Literal> }
@@ -53,7 +54,7 @@ Argument { VariableName | Real }
 AssertionArgument { NodeName | StarArgument | Real }
 
 LogicValue {
-  kw<"true"> | kw<"false"> | kw<"unknown"> | kw<"error">
+  ckw<"true"> | ckw<"false"> | ckw<"unknown"> | ckw<"error">
 }
 
 ScopeElement { RelationName ("=" | "+=") Multiplicity }
@@ -72,6 +73,8 @@ QualifiedName { identifier ("::" identifier)* }
 
 kw<term> { @specialize[@name={term}]<identifier, term> }
 
+ckw<term> { @extend[@name={term}]<identifier, term> }
+
 ParameterList<content> { "(" sep<",", content> ")" }
 
 sep<separator, content> { sep1<separator, content>? }
-- 
cgit v1.2.3-54-g00ecf