Fix Rel single expression handling (#34)

RelationalAI · Jul 3, 2023 · 237e7f3 · 237e7f3
1 parent 2949d93
commit 237e7f3
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 22 deletions.
diff --git a/dist/index.cjs b/dist/index.cjs
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.11",
+  "version": "0.2.12",
   "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/syntax.grammar b/src/syntax.grammar
@@ -1,4 +1,4 @@
-@top Rel { declaration+ }
+@top Rel { declaration+ | Annotation* Expression }
 
 @skip { spaces | newLine | LineComment | BlockComment }
 
@@ -24,7 +24,8 @@
     xor @right,
     relname @left,
     abstract @left,
-    parenOp
+    parenOp,
+    annot
 }
 
 declaration[@isGroup=Declaration] {
@@ -69,7 +70,7 @@ AnnotationKeyword {
 
 AnnotationParams { commaSep1<BaseLiteral> }
 
-Annotation { AnnotationKeyword ( "(" AnnotationParams ")" )? }
+Annotation { AnnotationKeyword ( !annot "(" AnnotationParams ")" )? }
 
 /*
  * Declaration Statements

diff --git a/test/cases.txt b/test/cases.txt
@@ -174,7 +174,7 @@ Rel(
                             LogicalExpression(
                                 BasicExpression(Literal(BaseLiteral(RelnameStringLiteral)))))))))))
 
-# Attribute Statement
+# Annotations
 
 @inline
 @function
@@ -515,3 +515,53 @@ Rel(
                                             LogicalExpression(
                                                 BasicExpression(Literal(BaseLiteral(IntLiteral)))))))))))))))
 
+# Expression
+
+@inline
+@static(1, :rel)
+{
+    1 + 2;
+    2023-07-01;
+    2023-07-01T00:00:00Z
+}
+
+==>
+
+Rel(
+    Annotation(AnnotationKeyword),
+    Annotation(
+        AnnotationKeyword,
+        AnnotationParams(BaseLiteral(IntLiteral), BaseLiteral(RelnameLiteral))
+    ),
+    Expression(
+        UnionExpression(
+            JoinExpression(
+                OverrideExpression(
+                    RestrictExpression(
+                        LogicalExpression(
+                            BasicExpression(
+                                BoundedExpression(
+                                    Expression(
+                                        UnionExpression(
+                                            UnionExpression(
+                                                UnionExpression(
+                                                    JoinExpression(
+                                                        OverrideExpression(
+                                                            RestrictExpression(
+                                                                LogicalExpression(
+                                                                    BasicExpression(
+                                                                        BasicExpression(Literal(BaseLiteral(IntLiteral))),
+                                                                        OperatorKeyword,
+                                                                        BasicExpression(Literal(BaseLiteral(IntLiteral))))))))),
+                                                JoinExpression(
+                                                    OverrideExpression(
+                                                        RestrictExpression(
+                                                            LogicalExpression(
+                                                                BasicExpression(Literal(BaseLiteral(DateLiteral)))))))),
+                                            JoinExpression(
+                                                OverrideExpression(
+                                                    RestrictExpression(
+                                                        LogicalExpression(
+                                                            BasicExpression(Literal(BaseLiteral(DateTimeLiteral))))))))))))))))))
+
+