From 71ca7296823dab6db807a689a98bd3da4664026d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= <vili.m.sinerva@gmail.com>
Date: Fri, 31 Jan 2025 21:02:14 +0200
Subject: [PATCH] Finalize parser for now :D

---
 src/compiler/parser/mod.rs | 47 +++++++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/compiler/parser/mod.rs b/src/compiler/parser/mod.rs
index 9a22937..4ad8163 100644
--- a/src/compiler/parser/mod.rs
+++ b/src/compiler/parser/mod.rs
@@ -10,16 +10,47 @@ use crate::compiler::{
 
 pub fn parse<'source>(tokens: &[Token<'source>]) -> Expression<'source> {
     let mut pos = 0;
-    let result = parse_block_level_expressions(&mut pos, tokens);
+
+    let first_expression = parse_block_level_expressions(&mut pos, tokens);
 
     if pos != tokens.len() {
-        panic!(
-            "Parsing naturally stopped at {}, despite there being more tokens!",
-            peek(&mut pos, tokens)
-        );
-    }
+        let mut expressions = vec![first_expression];
 
-    result
+        // Blocks don't need to be followed by a semicolon, but can be
+        if peek(&mut (pos - 1), tokens).text == "}" {
+            if peek(&mut pos, tokens).text == ";" {
+                consume_string(&mut pos, tokens, ";");
+            }
+        } else {
+            consume_string(&mut pos, tokens, ";");
+        }
+
+        while peek(&mut pos, tokens).token_type != TokenType::End {
+            expressions.push(parse_block_level_expressions(&mut pos, tokens));
+
+            if peek(&mut pos, tokens).token_type == TokenType::End {
+                break;
+            }
+
+            // Blocks don't need to be followed by a semicolon, but can be
+            if peek(&mut (pos - 1), tokens).text == "}" {
+                if peek(&mut pos, tokens).text == ";" {
+                    consume_string(&mut pos, tokens, ";");
+                }
+            } else {
+                consume_string(&mut pos, tokens, ";");
+            }
+        }
+
+        let last_token = peek(&mut (pos - 1), tokens);
+        if last_token.text == ";" {
+            expressions.push(EmptyLiteral(last_token.loc));
+        }
+
+        Block(tokens[0].loc, expressions)
+    } else {
+        first_expression
+    }
 }
 
 // Horrible name, basically used to get the full expressions contained
@@ -173,7 +204,7 @@ fn parse_block<'source>(pos: &mut usize, tokens: &[Token<'source>]) -> Expressio
     let start = consume_string(pos, tokens, "{");
 
     let mut expressions = Vec::new();
-    loop {
+    while peek(pos, tokens).text != "}" {
         expressions.push(parse_block_level_expressions(pos, tokens));
 
         // Last expression left as return expression, if no semicolon is present