Merge #171

171: parse parenthesized expressions r=nikomatsakis a=vemoo

As per doc comments tuples are of `len != 1` https://github.com/dada-lang/dada/blob/0793cdf392f8028b7f00e63cef304e51b77f7da5/components/dada-ir/src/code/syntax.rs#L135-L136

so I fixed parsing to match that.

fixes #141

Co-authored-by: Bernardo Uriarte <[email protected]>

components/dada-ir/src/code/syntax.rs

@@ -133,10 +133,10 @@ pub enum ExprData {
     /// `[shared|var|atomic] x = expr`
     Var(LocalVariableDecl, Expr),
 
-    /// `expr`
+    /// `(expr)`
     Parenthesized(Expr),
 
-    /// `(expr)` of len != 1
+    /// `()` or `(a, b, ...)` (i.e., expr seq cannot have length 1)
     Tuple(Vec<Expr>),
 
     /// `if condition { block } [else { block }]`

components/dada-parse/src/parser/code.rs

@@ -456,7 +456,15 @@ impl CodeParser<'_, '_> {
         } else if let Some((span, token_tree)) = self.delimited('(') {
             let expr =
                 self.with_sub_parser(token_tree, |subparser| subparser.parse_only_expr_seq());
-            Some(self.add(ExprData::Tuple(expr), span))
+
+            Some(self.add(
+                if expr.len() == 1 {
+                    ExprData::Parenthesized(expr[0])
+                } else {
+                    ExprData::Tuple(expr)
+                },
+                span,
+            ))
         } else {
             None
         }

components/dada-validate/src/validate/validator.rs

@@ -189,24 +189,12 @@ impl<'me> Validator<'me> {
 
     #[tracing::instrument(level = "debug", skip(self, expr))]
     fn give_validated_expr(&mut self, expr: syntax::Expr) -> validated::Expr {
-        let result = self.validate_expr_in_mode(expr, ExprMode::give());
-
-        // Check that the validated expression always has the same
-        // origin as the expression we started with.
-        assert_eq!(result.origin_in(self.origins).syntax_expr, expr);
-
-        result
+        self.validate_expr_in_mode(expr, ExprMode::give())
     }
 
     #[tracing::instrument(level = "debug", skip(self, expr))]
     pub(crate) fn reserve_validated_expr(&mut self, expr: syntax::Expr) -> validated::Expr {
-        let result = self.validate_expr_in_mode(expr, ExprMode::Reserve);
-
-        // Check that the validated expression always has the same
-        // origin as the expression we started with.
-        assert_eq!(result.origin_in(self.origins).syntax_expr, expr);
-
-        result
+        self.validate_expr_in_mode(expr, ExprMode::Reserve)
     }
 
     fn validate_expr_in_mode(&mut self, expr: syntax::Expr, mode: ExprMode) -> validated::Expr {

dada_tests/parser/parenthesized_expr.dada

@@ -0,0 +1,7 @@
+async fn main() {
+    x = (1 + 1)
+    print(x).await #! OUTPUT 2
+    x = (1)
+    print(x).await #! OUTPUT 1
+    print((3)).await #! OUTPUT 3
+}

dada_tests/parser/parenthesized_expr/stdout.ref

@@ -0,0 +1,3 @@
+2
+1
+3