refactor(language): disable rule parsing

Rules have too complex semantics to implement in the first prototype.

3 files changed, 21 insertions, 26 deletions

diff --git a/subprojects/frontend/src/language/folding.ts b/subprojects/frontend/src/language/folding.ts
index 9d1c04a3..4dabfa27 100644
--- a/subprojects/frontend/src/language/folding.ts
+++ b/subprojects/frontend/src/language/folding.ts
@@ -103,7 +103,7 @@ function foldWithSibling(node: SyntaxNode): FoldRange | null {
   return null;
 }
 
-export function foldWholeNode(node: SyntaxNode): FoldRange {
+function foldWholeNode(node: SyntaxNode): FoldRange {
   return {
     from: node.from,
     to: node.to,
diff --git a/subprojects/frontend/src/language/problem.grammar b/subprojects/frontend/src/language/problem.grammar
index 7feb6bfe..1e1ef70f 100644
--- a/subprojects/frontend/src/language/problem.grammar
+++ b/subprojects/frontend/src/language/problem.grammar
@@ -25,11 +25,11 @@ statement {
     RelationName ParameterList<Parameter>?
     PredicateBody { ("<->" sep<OrOp, Conjunction>)?  "." }
   } |
-  RuleDefinition {
-    ckw<"rule">
-    RuleName ParameterList<Parameter>?
-    RuleBody { ":" sep<OrOp, Conjunction> "==>" sep<OrOp, Consequent> "." }
-  } |
+  //RuleDefinition {
+  //  ckw<"rule">
+  //  RuleName ParameterList<Parameter>?
+  //  RuleBody { ":" sep<OrOp, Conjunction> "==>" sep<OrOp, Consequent> "." }
+  //} |
   Assertion {
     ckw<"default">? (NotOp | UnknownOp)? RelationName
     ParameterList<AssertionArgument> (":" LogicValue)? "."
@@ -73,13 +73,13 @@ Literal {
 
 Atom { RelationName "+"? ParameterList<Argument> }
 
-Consequent { ("," | Action)+ }
+//Consequent { ("," | Action)+ }
 
-Action {
-   ckw<"new"> VariableName ("<:" VariableName)? |
-   ckw<"delete"> VariableName |
-   Literal
-}
+//Action {
+//   ckw<"new"> VariableName ("<:" VariableName)? |
+//   ckw<"delete"> VariableName |
+//   Literal
+//}
 
 Argument { VariableName | Constant }
 
@@ -101,7 +101,7 @@ Multiplicity { (IntMult "..")? (IntMult | StarMult)}
 
 RelationName { QualifiedName }
 
-RuleName { QualifiedName }
+//RuleName { QualifiedName }
 
 IndividualNodeName { QualifiedName }
 
diff --git a/subprojects/frontend/src/language/problemLanguageSupport.ts b/subprojects/frontend/src/language/problemLanguageSupport.ts
index 03a7c4cc..a96b5402 100644
--- a/subprojects/frontend/src/language/problemLanguageSupport.ts
+++ b/subprojects/frontend/src/language/problemLanguageSupport.ts
@@ -8,12 +8,7 @@ import {
 } from '@codemirror/language';
 import { styleTags, tags as t } from '@lezer/highlight';
 
-import {
-  foldBlockComment,
-  foldConjunction,
-  foldDeclaration,
-  foldWholeNode,
-} from './folding';
+import { foldBlockComment, foldConjunction, foldDeclaration } from './folding';
 import {
   indentBlockComment,
   indentDeclaration,
@@ -26,12 +21,12 @@ const parserWithMetadata = parser.configure({
     styleTags({
       LineComment: t.lineComment,
       BlockComment: t.blockComment,
-      'problem class enum pred rule indiv scope': t.definitionKeyword,
+      'problem class enum pred indiv scope': t.definitionKeyword,
       'abstract extends refers contains container opposite': t.modifier,
       'default error contained containment': t.modifier,
       'true false unknown error': t.operatorKeyword,
       'may must current count': t.operatorKeyword,
-      'new delete': t.keyword,
+      // 'new delete': t.keyword,
       NotOp: t.operator,
       UnknownOp: t.operator,
       OrOp: t.separator,
@@ -40,7 +35,7 @@ const parserWithMetadata = parser.configure({
       StarMult: t.number,
       String: t.string,
       'RelationName/QualifiedName': t.typeName,
-      'RuleName/QualifiedName': t.typeName,
+      // 'RuleName/QualifiedName': t.typeName,
       'IndividualNodeName/QualifiedName': t.atom,
       'VariableName/QualifiedName': t.variableName,
       '{ }': t.brace,
@@ -54,7 +49,7 @@ const parserWithMetadata = parser.configure({
       UniqueDeclaration: indentDeclaration,
       ScopeDeclaration: indentDeclaration,
       PredicateBody: indentPredicateOrRule,
-      RuleBody: indentPredicateOrRule,
+      // RuleBody: indentPredicateOrRule,
       BlockComment: indentBlockComment,
     }),
     foldNodeProp.add({
@@ -62,9 +57,9 @@ const parserWithMetadata = parser.configure({
       EnumBody: foldInside,
       ParameterList: foldInside,
       PredicateBody: foldInside,
-      RuleBody: foldInside,
+      // RuleBody: foldInside,
       Conjunction: foldConjunction,
-      Consequent: foldWholeNode,
+      // Consequent: foldWholeNode,
       UniqueDeclaration: foldDeclaration,
       ScopeDeclaration: foldDeclaration,
       BlockComment: foldBlockComment,
@@ -82,7 +77,7 @@ const problemLanguage = LRLanguage.define({
       },
       line: '%',
     },
-    indentOnInput: /^\s*(?:\{|\}|\(|\)|;|\.|==>)$/,
+    indentOnInput: /^\s*(?:\{|\}|\(|\)|;|\.)$/,
   },
 });