Simplify ExprStmt parsing.

binary-banter · Oct 30, 2023 · 158793b · 158793b
1 parent 95394c6
commit 158793b
Show file tree

Hide file tree

Showing 2 changed files with 725 additions and 574 deletions.
diff --git a/compiler/src/passes/parse/grammar.lalrpop b/compiler/src/passes/parse/grammar.lalrpop
@@ -123,26 +123,15 @@ Type: Type = {
 Expr = ExprStmt;
 
 ExprStmt: Expr<&'input str> = {
-    // TODO yeet this?
-    "let" <mutable:"mut"?> <sym:Ident> "=" <bnd:ExprLogicalOr> ";" => Expr::Let {
+    "let" <mutable:"mut"?> <sym:Ident> "=" <bnd:ExprLogicalOr> ";" <bdy:ExprStmt?> => Expr::Let {
         sym,
         mutable: mutable.is_some(),
         bnd: Box::new(bnd),
-        bdy: Box::new(Expr::Lit { val: Lit::Unit }),
-    },
-    "let" <mutable:"mut"?> <sym:Ident> "=" <bnd:ExprLogicalOr> ";" <bdy:ExprStmt> => Expr::Let {
-        sym,
-        mutable: mutable.is_some(),
-        bnd: Box::new(bnd),
-        bdy: Box::new(bdy),
-    },
-    <stmt:ExprInStmt> ";" => Expr::Seq {
-        stmt: Box::new(stmt),
-        cnt: Box::new(Expr::Lit { val: Lit::Unit }),
+        bdy: Box::new(bdy.unwrap_or(Expr::Lit { val: Lit::Unit })),
     },
-    <stmt:ExprInStmt> ";" <cnt:ExprStmt> => Expr::Seq {
+    <stmt:ExprInStmt> ";" <cnt:ExprStmt?> => Expr::Seq {
         stmt: Box::new(stmt),
-        cnt: Box::new(cnt),
+        cnt: Box::new(cnt.unwrap_or(Expr::Lit { val: Lit::Unit })),
     },
     ExprInStmt,
 }