Add NODE_BLOCK for scoped expressions

3 files changed, 43 insertions, 25 deletions

diff --git a/src/nodes.c b/src/nodes.c
index fc39d8e..3a63246 100644
--- a/src/nodes.c
+++ b/src/nodes.c
@@ -64,6 +64,15 @@ print_node(Node *node) {
             print_node(node->def.value);
             printf(")");
         } break;
+        case NODE_BLOCK: {
+            size_t n_expr = array_size(node->block.expr);
+            printf("{");
+            for (size_t i = 0; i < n_expr; ++i) {
+                printf(" ");
+                print_node(node->block.expr[i]);
+            }
+            printf(" }");
+        } break;
         case NODE_FUN: {
             printf("(fun ");
             print_node(node->fun.name);
@@ -80,13 +89,8 @@ print_node(Node *node) {
             printf(")");
             printf(": ");
             print_node(node->fun.return_type);
-
-            size_t n_expr = array_size(node->fun.body);
-            for (size_t i = 0; i < n_expr; ++i) {
-                printf(" ");
-                print_node(node->fun.body[i]);
-            }
-
+            printf(" ");
+            print_node(node->fun.body);
             printf(")");
         } break;
         default: { printf("{#unknown#}"); } break;
diff --git a/src/nodes.h b/src/nodes.h
index 2e24ea5..c1520b3 100644
--- a/src/nodes.h
+++ b/src/nodes.h
@@ -11,6 +11,7 @@ typedef enum NodeType {
     NODE_DEF,
     NODE_SET,
     NODE_FUN,
+    NODE_BLOCK,
 } NodeType;
 
 typedef struct Node {
@@ -55,8 +56,13 @@ typedef struct Node {
             struct Node **param_names;
             struct Node **param_types;
             struct Node *return_type;
-            struct Node **body;
+            struct Node *body;
         } fun;
+
+        // Block statements.
+        struct {
+            struct Node **expr;
+        } block;
     };
 } Node;
 
diff --git a/src/parser.c b/src/parser.c
index cfbefaf..58ad722 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -258,7 +258,6 @@ parse_fun(Parser *parser) {
     node->fun.name = name;
     array_init(node->fun.param_names, 0);
     array_init(node->fun.param_types, 0);
-    array_init(node->fun.body, 0);
 
     // Parse parameter list and return type.
     if (!consume_lparen(parser)) {
@@ -287,19 +286,12 @@ parse_fun(Parser *parser) {
     }
     node->fun.return_type = ret_type;
 
-    // Parse body.
-    while (true) {
-        Token next = peek_token(parser);
-        if (next.type == TOKEN_RPAREN) {
-            next_token(parser);
-            break;
-        }
-        Node *expr = parse_next(parser);
-        if (expr == NULL) {
-            return NULL;
-        }
-        array_push(node->fun.body, expr);
+    Node *body = parse_next(parser);
+    if (body == NULL) {
+        return NULL;
     }
+    node->fun.body = body;
+    consume_rparen(parser);
 
     return node;
 }
@@ -331,10 +323,25 @@ parse_paren(Parser *parser) {
     return NULL;
 }
 
-
-// TODO: Parse if: (def ...) shouldn't be allowed for now on if statements. In
-// the future, an if can create a new block and thus a fresh scope which would
-// make the decision of what variables are active trivial.
+Node *
+parse_block(Parser *parser) {
+    next_token(parser); // Skip paren.
+    Node *node = alloc_node(NODE_BLOCK);
+    array_init(node->block.expr, 0);
+    while (true) {
+        Token next = peek_token(parser);
+        if (next.type == TOKEN_RCURLY) {
+            next_token(parser);
+            break;
+        }
+        Node *expr = parse_next(parser);
+        if (expr == NULL) {
+            return NULL;
+        }
+        array_push(node->block.expr, expr);
+    }
+    return node;
+}
 
 Node *
 parse_next(Parser *parser) {
@@ -347,6 +354,7 @@ parse_next(Parser *parser) {
         case TOKEN_FALSE: { return parse_bool(parser); } break;
         case TOKEN_LPAREN: { return parse_paren(parser); } break;
         case TOKEN_EOF: { return NULL; } break;
+        case TOKEN_LCURLY: { return parse_block(parser); } break;
         default: {
             push_error(ERR_TYPE_PARSER, ERR_UNKNOWN_TOK_TYPE, tok.line, tok.col);
             return NULL;