chore: moved program structure from ast to standalone file

Author: nos1dot618

CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(frontend STATIC
     ${CMAKE_SOURCE_DIR}/src/frontend/token.cpp
     ${CMAKE_SOURCE_DIR}/src/frontend/lexer.cpp
     ${CMAKE_SOURCE_DIR}/src/frontend/ast.cpp
+    ${CMAKE_SOURCE_DIR}/src/frontend/program.cpp
     ${CMAKE_SOURCE_DIR}/src/frontend/parser.cpp
 )
 

include/lbd/frontend/ast.h

@@ -98,6 +98,7 @@ namespace frontend {
         friend std::ostream &operator<<(std::ostream &outputStream, const DefinitionAstNode &node);
     };
 
+    // NOTE: Owning and move-only, not copyable.
     struct AstNode {
         using NodeVariant = std::variant<Expression, DefinitionAstNode>;
 
@@ -107,10 +108,4 @@ namespace frontend {
 
         friend std::ostream &operator<<(std::ostream &outputStream, const AstNode &node);
     };
-
-    struct Program {
-        std::vector<AstNode> nodes;
-
-        friend std::ostream &operator<<(std::ostream &outputStream, const Program &program);
-    };
 }

include/lbd/frontend/location.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <iostream>
 
 namespace frontend {
     struct Location {

include/lbd/frontend/parser.h

@@ -3,11 +3,13 @@
 #include <lbd/options.h>
 #include <lbd/frontend/ast.h>
 #include <lbd/frontend/token.h>
+#include <lbd/frontend/program.h>
 #include <lbd/interpreter/type.h>
 #include <vector>
 
 namespace frontend {
     struct Parser {
+        // TODO: Make this private
         Program program;
 
         explicit Parser(const std::vector<token::Token> &tokens, context::Options options_ = {});
@@ -22,7 +24,8 @@ namespace frontend {
 
         static IdentifierAstNode consumeIdentifier(const std::vector<token::Token> &tokens, size_t &index);
 
-        static interpreter::type::PrimitiveType consumePrimitiveTypeName(const std::vector<token::Token> &tokens, size_t &index);
+        static interpreter::type::PrimitiveType consumePrimitiveTypeName(
+            const std::vector<token::Token> &tokens, size_t &index);
 
         static interpreter::type::Type parseType(const std::vector<token::Token> &tokens, size_t &index);
 

include/lbd/frontend/program.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <lbd/frontend/ast.h>
+#include <vector>
+
+namespace frontend {
+    struct Program {
+        std::vector<AstNode> astNodes;
+
+        friend std::ostream &operator<<(std::ostream &outputStream, const Program &program);
+    };
+}

include/lbd/logs.h

@@ -2,7 +2,7 @@
 
 #include <optional>
 #include <lbd/frontend/location.h>
-#include <lbd/utils/term.h>
+#include <lbd/utils/terminal.h>
 #include <lbd/exceptions.h>
 
 namespace logs {

include/lbd/options.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "logs.h"
+#include <lbd/logs.h>
 
 namespace context {
     struct Options {

include/lbd/utils/term.h include/lbd/utils/terminal.hinclude/lbd/utils/term.h renamed to include/lbd/utils/terminal.h

@@ -109,11 +109,4 @@ namespace frontend {
         node.print(outputStream, 0);
         return outputStream;
     }
-
-    std::ostream &operator<<(std::ostream &outputStream, const Program &program) {
-        for (const AstNode &node: program.nodes) {
-            outputStream << node;
-        }
-        return outputStream;
-    }
 }

src/frontend/ast.cpp

@@ -159,8 +159,8 @@ namespace frontend {
                 optionsValue.logger.debug(token);
             }
         }
-        for (Parser parser(tokens, optionsValue); auto &node: parser.program.nodes) {
-            nodes.emplace_back(std::move(node));
+        for (Parser parser(tokens, optionsValue); auto &astNode: parser.program.astNodes) {
+            nodes.emplace_back(std::move(astNode));
         }
     }