RAI-16078 fix qualified names (#36)

RelationalAI · Sep 13, 2023 · a924272 · a924272
1 parent daf6ceb
commit a924272
Show file tree

Hide file tree

Showing 17 changed files with 893 additions and 843 deletions.
diff --git a/dist/index.cjs b/dist/index.cjs
diff --git a/dist/index.cjs.d.ts b/dist/index.cjs.d.ts
@@ -33,44 +33,44 @@ declare namespace relTerms {
     const QualifiedName: 35;
     const QualifiedNameId: 36;
     const QualifiedKeyword: 42;
-    const QualifiedNameElem: 64;
-    const FormalParamsBracket: 65;
-    const FormalParams: 66;
-    const FormalParam: 67;
-    const Literal: 68;
-    const BooleanLiteral: 69;
-    const SpecializeIntLiteral: 70;
-    const InterpolationLiteral: 71;
-    const Interpolation: 72;
-    const InterpolationId: 73;
-    const InterpolationExpression: 74;
-    const Expression: 75;
-    const UnionExpression: 76;
-    const JoinExpression: 77;
-    const OverrideExpression: 78;
-    const RestrictExpression: 79;
-    const LogicalExpression: 80;
-    const BasicExpression: 81;
-    const SpecializeExpression: 82;
-    const PartialApplicationExpression: 84;
-    const NocommaParam: 85;
-    const NocommaExpression: 86;
-    const NocommaUnionExpression: 87;
-    const NocommaAbstractExpression: 88;
-    const Bindings: 89;
-    const LogicalParam: 90;
-    const ApplicationExpression: 91;
-    const BoundedExpression: 128;
-    const LogicalAbstractExpression: 129;
-    const AbstractExpression: 144;
-    const InterpolationMultilineLiteral: 145;
-    const FormalParamsParen: 148;
-    const BoundDeclaration: 149;
-    const ValueTypeDeclaration: 150;
-    const EntityTypeDeclaration: 151;
-    const ConstraintDeclaration: 152;
-    const ModuleDeclaration: 153;
-    const WithUseDeclaration: 154;
+    const QualifiedNameElem: 60;
+    const FormalParamsBracket: 61;
+    const FormalParams: 62;
+    const FormalParam: 63;
+    const Literal: 64;
+    const BooleanLiteral: 65;
+    const SpecializeIntLiteral: 66;
+    const InterpolationLiteral: 67;
+    const Interpolation: 68;
+    const InterpolationId: 69;
+    const InterpolationExpression: 70;
+    const Expression: 71;
+    const UnionExpression: 72;
+    const JoinExpression: 73;
+    const OverrideExpression: 74;
+    const RestrictExpression: 75;
+    const LogicalExpression: 76;
+    const BasicExpression: 77;
+    const SpecializeExpression: 78;
+    const PartialApplicationExpression: 80;
+    const NocommaParam: 81;
+    const NocommaExpression: 82;
+    const NocommaUnionExpression: 83;
+    const NocommaAbstractExpression: 84;
+    const Bindings: 85;
+    const LogicalParam: 86;
+    const ApplicationExpression: 87;
+    const BoundedExpression: 124;
+    const LogicalAbstractExpression: 127;
+    const AbstractExpression: 143;
+    const InterpolationMultilineLiteral: 144;
+    const FormalParamsParen: 147;
+    const BoundDeclaration: 148;
+    const ValueTypeDeclaration: 149;
+    const EntityTypeDeclaration: 150;
+    const ConstraintDeclaration: 151;
+    const ModuleDeclaration: 152;
+    const WithUseDeclaration: 153;
     const Alias: 155;
     const AliasId: 156;
 }

diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -33,44 +33,44 @@ declare namespace relTerms {
     const QualifiedName: 35;
     const QualifiedNameId: 36;
     const QualifiedKeyword: 42;
-    const QualifiedNameElem: 64;
-    const FormalParamsBracket: 65;
-    const FormalParams: 66;
-    const FormalParam: 67;
-    const Literal: 68;
-    const BooleanLiteral: 69;
-    const SpecializeIntLiteral: 70;
-    const InterpolationLiteral: 71;
-    const Interpolation: 72;
-    const InterpolationId: 73;
-    const InterpolationExpression: 74;
-    const Expression: 75;
-    const UnionExpression: 76;
-    const JoinExpression: 77;
-    const OverrideExpression: 78;
-    const RestrictExpression: 79;
-    const LogicalExpression: 80;
-    const BasicExpression: 81;
-    const SpecializeExpression: 82;
-    const PartialApplicationExpression: 84;
-    const NocommaParam: 85;
-    const NocommaExpression: 86;
-    const NocommaUnionExpression: 87;
-    const NocommaAbstractExpression: 88;
-    const Bindings: 89;
-    const LogicalParam: 90;
-    const ApplicationExpression: 91;
-    const BoundedExpression: 128;
-    const LogicalAbstractExpression: 129;
-    const AbstractExpression: 144;
-    const InterpolationMultilineLiteral: 145;
-    const FormalParamsParen: 148;
-    const BoundDeclaration: 149;
-    const ValueTypeDeclaration: 150;
-    const EntityTypeDeclaration: 151;
-    const ConstraintDeclaration: 152;
-    const ModuleDeclaration: 153;
-    const WithUseDeclaration: 154;
+    const QualifiedNameElem: 60;
+    const FormalParamsBracket: 61;
+    const FormalParams: 62;
+    const FormalParam: 63;
+    const Literal: 64;
+    const BooleanLiteral: 65;
+    const SpecializeIntLiteral: 66;
+    const InterpolationLiteral: 67;
+    const Interpolation: 68;
+    const InterpolationId: 69;
+    const InterpolationExpression: 70;
+    const Expression: 71;
+    const UnionExpression: 72;
+    const JoinExpression: 73;
+    const OverrideExpression: 74;
+    const RestrictExpression: 75;
+    const LogicalExpression: 76;
+    const BasicExpression: 77;
+    const SpecializeExpression: 78;
+    const PartialApplicationExpression: 80;
+    const NocommaParam: 81;
+    const NocommaExpression: 82;
+    const NocommaUnionExpression: 83;
+    const NocommaAbstractExpression: 84;
+    const Bindings: 85;
+    const LogicalParam: 86;
+    const ApplicationExpression: 87;
+    const BoundedExpression: 124;
+    const LogicalAbstractExpression: 127;
+    const AbstractExpression: 143;
+    const InterpolationMultilineLiteral: 144;
+    const FormalParamsParen: 147;
+    const BoundDeclaration: 148;
+    const ValueTypeDeclaration: 149;
+    const EntityTypeDeclaration: 150;
+    const ConstraintDeclaration: 151;
+    const ModuleDeclaration: 152;
+    const WithUseDeclaration: 153;
     const Alias: 155;
     const AliasId: 156;
 }

diff --git a/dist/index.js b/dist/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@relationalai/codemirror-lang-rel",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "CodeMirror 6 language support for Rel",
   "scripts": {
     "test": "mocha test/test.js",

diff --git a/src/parser.js b/src/parser.js
diff --git a/src/parser.terms.js b/src/parser.terms.js
@@ -33,43 +33,43 @@ export const
   QualifiedName = 35,
   QualifiedNameId = 36,
   QualifiedKeyword = 42,
-  QualifiedNameElem = 64,
-  FormalParamsBracket = 65,
-  FormalParams = 66,
-  FormalParam = 67,
-  Literal = 68,
-  BooleanLiteral = 69,
-  SpecializeIntLiteral = 70,
-  InterpolationLiteral = 71,
-  Interpolation = 72,
-  InterpolationId = 73,
-  InterpolationExpression = 74,
-  Expression = 75,
-  UnionExpression = 76,
-  JoinExpression = 77,
-  OverrideExpression = 78,
-  RestrictExpression = 79,
-  LogicalExpression = 80,
-  BasicExpression = 81,
-  SpecializeExpression = 82,
-  PartialApplicationExpression = 84,
-  NocommaParam = 85,
-  NocommaExpression = 86,
-  NocommaUnionExpression = 87,
-  NocommaAbstractExpression = 88,
-  Bindings = 89,
-  LogicalParam = 90,
-  ApplicationExpression = 91,
-  BoundedExpression = 128,
-  LogicalAbstractExpression = 129,
-  AbstractExpression = 144,
-  InterpolationMultilineLiteral = 145,
-  FormalParamsParen = 148,
-  BoundDeclaration = 149,
-  ValueTypeDeclaration = 150,
-  EntityTypeDeclaration = 151,
-  ConstraintDeclaration = 152,
-  ModuleDeclaration = 153,
-  WithUseDeclaration = 154,
+  QualifiedNameElem = 60,
+  FormalParamsBracket = 61,
+  FormalParams = 62,
+  FormalParam = 63,
+  Literal = 64,
+  BooleanLiteral = 65,
+  SpecializeIntLiteral = 66,
+  InterpolationLiteral = 67,
+  Interpolation = 68,
+  InterpolationId = 69,
+  InterpolationExpression = 70,
+  Expression = 71,
+  UnionExpression = 72,
+  JoinExpression = 73,
+  OverrideExpression = 74,
+  RestrictExpression = 75,
+  LogicalExpression = 76,
+  BasicExpression = 77,
+  SpecializeExpression = 78,
+  PartialApplicationExpression = 80,
+  NocommaParam = 81,
+  NocommaExpression = 82,
+  NocommaUnionExpression = 83,
+  NocommaAbstractExpression = 84,
+  Bindings = 85,
+  LogicalParam = 86,
+  ApplicationExpression = 87,
+  BoundedExpression = 124,
+  LogicalAbstractExpression = 127,
+  AbstractExpression = 143,
+  InterpolationMultilineLiteral = 144,
+  FormalParamsParen = 147,
+  BoundDeclaration = 148,
+  ValueTypeDeclaration = 149,
+  EntityTypeDeclaration = 150,
+  ConstraintDeclaration = 151,
+  ModuleDeclaration = 152,
+  WithUseDeclaration = 153,
   Alias = 155,
   AliasId = 156
diff --git a/src/syntax.grammar b/src/syntax.grammar
@@ -24,7 +24,6 @@
     impliesL @left,
     iff @right,
     xor @right,
-    relname @left,
     abstract @left,
     parenOp,
     annot
@@ -133,17 +132,13 @@ QualifiedKeyword {
     kw<"ic"> |
     kw<"module"> |
     kw<"end"> |
-    kw<"with"> |
     kw<"use"> |
     kw<"as"> |
-    kw<"if"> |
     kw<"then"> |
     kw<"else"> |
     kw<"forall"> |
-    kw<"exists"> |
     kw<"and"> |
     kw<"or"> |
-    kw<"not"> |
     kw<"implies"> |
     kw<"iff"> |
     kw<"xor"> |
@@ -504,7 +499,8 @@ FormalParamsParen { "(" FormalParams? ")" }
     @precedence { ConstructorId Operator }
     @precedence { FloatLiteral Operator }
     @precedence { "..." Operator ":" }
-    @precedence { RelnameLiteral QualifiedNameElem ":" }
+    @precedence { QualifiedNameElem ":" }
+    @precedence { RelnameLiteral ":" }
     @precedence { BasicId "_" }
     @precedence { LineComment Operator }
     @precedence { MultilineDocstringLiteral DocstringLiteral }