From fcfe6392a482fb2c3a15af19518c89093d4fa159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Grodzi=C5=84ski?= <rafal.grodzinski@gmail.com>
Date: Sun, 1 Jun 2025 23:17:07 +0900
Subject: [PATCH] Function declaration statement

---
 src/Parser.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Parser.cpp b/src/Parser.cpp
index 1f66b36..9cb91a4 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -23,6 +23,12 @@ vector<shared_ptr<Statement>> Parser::getStatements() {
 // Statement
 //
 shared_ptr<Statement> Parser::nextStatement() {
+    {
+        shared_ptr<Statement> statement = matchFunctionDeclarationStatement();
+        if (statement->isValid())
+            return statement;
+    }
+
     {
         shared_ptr<Statement> statement = matchExpressionStatement();
         if (statement->isValid())
@@ -34,7 +40,7 @@ shared_ptr<Statement> Parser::nextStatement() {
 
 shared_ptr<Statement> Parser::matchFunctionDeclarationStatement() {
     if (!matchesTokenKinds({Token::Kind::IDENTIFIER, Token::Kind::COLON, Token::Kind::FUNCTION}))
-        return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), nullptr, nullptr, { }, "");
+        return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), nullptr, nullptr, vector<shared_ptr<Statement>>(), "");
 
     Token identifierToken = tokens.at(currentIndex);
     currentIndex++;
@@ -49,7 +55,7 @@ shared_ptr<Statement> Parser::matchFunctionDeclarationStatement() {
     if (!blockStatement->isValid())
         return blockStatement;
     
-    return make_shared<Statement>(Statement::Kind::FUNCTION_DECLARATION, nullptr, nullptr, blockStatement, { }, identifierToken.getLexme());
+    return make_shared<Statement>(Statement::Kind::FUNCTION_DECLARATION, nullptr, nullptr, blockStatement, vector<shared_ptr<Statement>>(), identifierToken.getLexme());
 }
 
 shared_ptr<Statement> Parser::matchBlockStatement() {
@@ -62,11 +68,18 @@ shared_ptr<Statement> Parser::matchBlockStatement() {
         statements.push_back(statement);
     }
     currentIndex++; // skip ;
+
+    if (!tokens.at(currentIndex).isOfKind({Token::Kind::NEW_LINE, Token::Kind::END}))
+        return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), nullptr, nullptr, vector<shared_ptr<Statement>>(), "");
+    
+    if (tokens.at(currentIndex).getKind() == Token::Kind::NEW_LINE)
+        currentIndex++;
+
     return make_shared<Statement>(Statement::Kind::BLOCK, nullptr, nullptr, nullptr, statements, "");
 }
 
 shared_ptr<Statement> Parser::matchInvalidStatement() {
-    return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), nullptr, nullptr, { }, "");
+    return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), nullptr, nullptr, vector<shared_ptr<Statement>>(), "");
 }
 
 //
@@ -76,9 +89,9 @@ shared_ptr<Statement> Parser::matchExpressionStatement() {
     shared_ptr<Expression> expression = term();
     if (expression->isValid() && tokens.at(currentIndex).isOfKind({Token::Kind::NEW_LINE, Token::Kind::END})) {
         currentIndex++;
-        return make_shared<Statement>(Statement::Kind::EXPRESSION, nullptr, expression, nullptr, { }, "");
+        return make_shared<Statement>(Statement::Kind::EXPRESSION, nullptr, expression, nullptr, vector<shared_ptr<Statement>>(), "");
     } else {
-        return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), expression, nullptr, { }, "");
+        return make_shared<Statement>(Statement::Kind::INVALID, make_shared<Token>(tokens.at(currentIndex)), expression, nullptr, vector<shared_ptr<Statement>>(), "");
     }
 }