Changed include path, moved ProgramNode to BlockNode to be used later.

include/ast/ProgramNode.h → include/ast/BlockNode.h

 #pragma once
+
 #include "ast/Node.h"
 
 namespace funk
 {
-class ProgramNode : public Node
+
+class BlockNode : public Node
 {
 public:
-    ProgramNode(const SourceLocation& loc);
-    ~ProgramNode();
+    BlockNode(const SourceLocation& loc);
+    ~BlockNode();
 
     void add(Node* statement);
+    Vector<Node*> get_statements() const;
 
     Node* evaluate() const override;
     String to_s() const override;
@@ -17,4 +20,5 @@ public:
 private:
     Vector<Node*> statements;
 };
+
 } // namespace funk

include/parser/Parser.h

@@ -10,11 +10,11 @@
 #include "token/Token.h"
 #include "utils/Common.h"
 
-#include "ast/BinaryOpNode.h"
-#include "ast/LiteralNode.h"
+#include "ast/BlockNode.h"
 #include "ast/Node.h"
-#include "ast/ProgramNode.h"
-#include "ast/UnaryOpNode.h"
+#include "ast/expression/BinaryOpNode.h"
+#include "ast/expression/LiteralNode.h"
+#include "ast/expression/UnaryOpNode.h"
 
 namespace funk
 {

source/ast/ProgramNode.cc → source/ast/BlockNode.cc

-#include "ast/ProgramNode.h"
+#include "ast/BlockNode.h"
 
 namespace funk
 {
-ProgramNode::ProgramNode(const SourceLocation& loc) : Node(loc), statements{} {}
+BlockNode::BlockNode(const SourceLocation& loc) : Node(loc), statements{} {}
 
-ProgramNode::~ProgramNode()
+BlockNode::~BlockNode()
 {
     for (Node* statement : statements) { delete statement; }
 }
 
-void ProgramNode::add(Node* statement)
+void BlockNode::add(Node* statement)
 {
     statements.push_back(statement);
 }
 
-Node* ProgramNode::evaluate() const
+Vector<Node*> BlockNode::get_statements() const
+{
+    return statements;
+}
+
+Node* BlockNode::evaluate() const
 {
     if (cached_eval) { return cached_eval; }
 
@@ -23,7 +28,7 @@ Node* ProgramNode::evaluate() const
     return cached_eval = result;
 }
 
-String ProgramNode::to_s() const
+String BlockNode::to_s() const
 {
     String repr{};
 

source/parser/Parser.cc

@@ -11,9 +11,9 @@ Node* Parser::parse()
 {
     LOG_DEBUG("Parse program");
 
-    ProgramNode* program = new ProgramNode(SourceLocation(filename, 0, 0));
-    while (!done()) { program->add(parse_statement()); }
-    return program;
+    BlockNode* block = new BlockNode(SourceLocation(filename, 0, 0));
+    while (!done()) { block->add(parse_statement()); }
+    return block;
 }
 
 Parser Parser::load(String filename)