2 files changed, 31 insertions, 4 deletions

diff --git a/src/lexer.c b/src/lexer.c
index 2d2b6fc..2feba2a 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -1,3 +1,6 @@
+#ifndef LEXER_C
+#define LEXER_C
+
 #include "badlib.h"
 
 #define LEXER_MEM GB(2)
@@ -610,3 +613,19 @@ scan_token(Scanner *scanner) {
     }
     return emit_token(current, scanner, TOK_SYMBOL);
 }
+
+void
+print_token(Token tok) {
+    println("%d:%d\t%s %s", tok.line, tok.col, token_str[tok.kind], tok.val);
+}
+
+void
+print_tokens(Str path, Token *tokens) {
+    for (sz i = 0; i < array_size(tokens); i++) {
+        Token tok = tokens[i];
+        print("%s:", path);
+        print_token(tok);
+    }
+}
+
+#endif // LEXER_C
diff --git a/src/main.c b/src/main.c
index 666a664..d001d9c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -584,8 +584,12 @@ parse_keyword(Parser *parser) {
         case TOK_IF: {
             node = node_alloc(parser, NODE_IF, prev);
             if (!node) return;
+            parse_consume(parser, TOK_LPAREN,
+                          cstr("expected '(' on if expression"));
             parse_expr(parser, PREC_LOW);
             node->cond_if = array_pop(parser->nodes);
+            parse_consume(parser, TOK_RPAREN,
+                          cstr("expected ')' on if expression"));
             parse_expr(parser, PREC_LOW);
             node->cond_expr = array_pop(parser->nodes);
             if (parse_match(parser, TOK_ELSE)) {
@@ -596,10 +600,12 @@ parse_keyword(Parser *parser) {
         case TOK_MATCH: {
             node = node_alloc(parser, NODE_MATCH, prev);
             if (!node) return;
+            parse_consume(parser, TOK_LPAREN,
+                          cstr("expected '(' on if expression"));
             parse_expr(parser, PREC_LOW);
             node->match_expr = array_pop(parser->nodes);
-            parse_consume(parser, TOK_ASSIGN,
-                          cstr("malformed match statement"));
+            parse_consume(parser, TOK_RPAREN,
+                          cstr("expected ')' on if expression"));
             parse_consume(parser, TOK_LCURLY,
                           cstr("expected block of match cases"));
             while (!parse_match(parser, TOK_RCURLY) && !parser->panic) {
@@ -686,10 +692,12 @@ parse_keyword(Parser *parser) {
         case TOK_WHILE: {
             node = node_alloc(parser, NODE_WHILE, prev);
             if (!node) return;
+            parse_consume(parser, TOK_LPAREN,
+                          cstr("expected '(' on while expression"));
             parse_expr(parser, PREC_LOW);
             node->while_cond = array_pop(parser->nodes);
-            parse_consume(parser, TOK_ASSIGN,
-                          cstr("malformed while expression"));
+            parse_consume(parser, TOK_RPAREN,
+                          cstr("expected ')' on while expression"));
             parse_expr(parser, PREC_LOW);
             node->while_expr = array_pop(parser->nodes);
         } break;