From 118a5ac54e63222b78c60cc3666fa6e215224670 Mon Sep 17 00:00:00 2001
From: Kasey White <kwhitemsg@gmail.com>
Date: Sat, 1 Oct 2022 19:34:42 -0400
Subject: [PATCH] add some block parsing and a test (incomplete)

---
 crates/lang/src/parser.rs       | 19 +++++++++++++++++--
 crates/lang/src/tests/parser.rs |  7 +++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/crates/lang/src/parser.rs b/crates/lang/src/parser.rs
index 10b0c27e..2e3e8ce2 100644
--- a/crates/lang/src/parser.rs
+++ b/crates/lang/src/parser.rs
@@ -312,7 +312,7 @@ pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError
             .ignore_then(pattern_parser())
             .then(just(Token::Colon).ignore_then(type_parser()).or_not())
             .then_ignore(just(Token::Equal))
-            .then(r)
+            .then(r.clone())
             .map_with_span(
                 |((pattern, annotation), value), span| expr::UntypedExpr::Assignment {
                     location: span,
@@ -323,6 +323,19 @@ pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError
                 },
             );
 
+        let expr_block_parser = just(Token::LeftBrace)
+            .ignore_then(r.clone().then(r.repeated()))
+            .then_ignore(just(Token::RightBrace))
+            .map_with_span(|(a, b), span| {
+                let mut expressions = vec![a];
+                expressions.extend(b);
+
+                expr::UntypedExpr::Sequence {
+                    location: span,
+                    expressions,
+                }
+            });
+
         let expr_unit_parser = choice((
             string_parser,
             int_parser,
@@ -330,6 +343,7 @@ pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError
             todo_parser,
             list_parser,
             assignment_parser,
+            expr_block_parser,
         ))
         .boxed();
 
@@ -368,7 +382,7 @@ pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError
             })
             .boxed();
 
-        // Logical
+        // Comparison
         let op = choice((
             just(Token::EqualEqual).to(BinOp::Eq),
             just(Token::NotEqual).to(BinOp::NotEq),
@@ -389,6 +403,7 @@ pub fn expr_parser() -> impl Parser<Token, expr::UntypedExpr, Error = ParseError
             })
             .boxed();
 
+        // Logical
         let op = choice((
             just(Token::AmperAmper).to(BinOp::And),
             just(Token::VbarVbar).to(BinOp::Or),
diff --git a/crates/lang/src/tests/parser.rs b/crates/lang/src/tests/parser.rs
index d2cfce55..c8ad1fd8 100644
--- a/crates/lang/src/tests/parser.rs
+++ b/crates/lang/src/tests/parser.rs
@@ -50,6 +50,13 @@ fn module() {
 
               y
             }
+
+            pub fn wow2(a: Int){
+                let x = 1 + {
+                    2 + 7 * 8
+                } / 2
+                x
+            }
         "#;
     let len = code.chars().count();