From c9e21213fd9293d47c3161f0ee9c26f51bf432f8 Mon Sep 17 00:00:00 2001
From: Karma Riuk <riukkarma@gmail.com>
Date: Tue, 8 Jul 2025 15:52:40 +0200
Subject: [PATCH] made setup for expression parsing

---
 src/parser/parser.cpp      | 10 +++++++++-
 src/parser/parser.hpp      | 11 +++++++++++
 test/parser/expression.cpp | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 test/parser/expression.cpp

diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
index 5f5bb08..5ec562c 100644
--- a/src/parser/parser.cpp
+++ b/src/parser/parser.cpp
@@ -35,7 +35,7 @@ namespace parser {
         case token::type::RETURN:
             return parse_return();
         default:
-            return nullptr;
+            return parse_expression_stmt();
         }
     }
 
@@ -102,4 +102,12 @@ namespace parser {
         for (const auto& e : errors)
             delete e;
     }
+
+    void parser::register_prefix(token::type type, prefix_parse_fn fn) {
+        prefix_parse_fns[type] = fn;
+    };
+
+    void parser::register_infix(token::type type, infix_parse_fn fn) {
+        infix_parse_fns[type] = fn;
+    };
 } // namespace parser
diff --git a/src/parser/parser.hpp b/src/parser/parser.hpp
index 1e045f8..078905c 100644
--- a/src/parser/parser.hpp
+++ b/src/parser/parser.hpp
@@ -9,9 +9,14 @@
 #include "lexer/lexer.hpp"
 #include "token/token.hpp"
 
+#include <functional>
 #include <vector>
 
 namespace parser {
+
+    using prefix_parse_fn = std::function<ast::expression*()>;
+    using infix_parse_fn = std::function<ast::expression*(ast::expression*)>;
+
     struct parser {
         parser(lexer::lexer& lexer);
         ~parser();
@@ -23,6 +28,9 @@ namespace parser {
         lexer::lexer& lexer;
         token::token current, next;
 
+        std::unordered_map<token::type, prefix_parse_fn> prefix_parse_fns;
+        std::unordered_map<token::type, infix_parse_fn> infix_parse_fns;
+
         void next_token();
         ast::statement* parse_statement();
         ast::expression* parse_expression();
@@ -31,5 +39,8 @@ namespace parser {
         ast::expression_stmt* parse_expression_stmt();
         bool expect_next(token::type);
         void next_error(token::type);
+
+        void register_prefix(token::type, prefix_parse_fn);
+        void register_infix(token::type, infix_parse_fn);
     };
 } // namespace parser
diff --git a/test/parser/expression.cpp b/test/parser/expression.cpp
new file mode 100644
index 0000000..dcb6cf4
--- /dev/null
+++ b/test/parser/expression.cpp
@@ -0,0 +1,32 @@
+#include "ast/expressions/identifier.hpp"
+#include "utils.hpp"
+
+#include <doctest.h>
+
+TEST_SUITE("Parser: expression") {
+    TEST_CASE_FIXTURE(ParserFixture, "Simple expression statement") {
+        setup("foobar;");
+        REQUIRE(program->statements.size() == 1);
+        ast::expression_stmt* expression_stmt;
+        REQUIRE_NOTHROW(
+            expression_stmt =
+                dynamic_cast<ast::expression_stmt*>(program->statements[0])
+        );
+        REQUIRE_MESSAGE(
+            expression_stmt != nullptr,
+            "Couldn't cast statement to an expression statement"
+        );
+
+        ast::identifier* ident;
+        REQUIRE_NOTHROW(
+            ident = dynamic_cast<ast::identifier*>(expression_stmt->expression)
+        );
+        REQUIRE_MESSAGE(
+            ident != nullptr,
+            "Couldn't cast expression to an identifier"
+        );
+
+        REQUIRE(ident->value == "foobar");
+        REQUIRE(ident->token_literal() == "foobar");
+    };
+}