ast restructring

.gitignore

@@ -3,4 +3,5 @@
 *.a
 .vscode
 /bin
-.VSCodeCounter
+.VSCodeCounter
+optimize

ltnc/Backend.hxx

@@ -1,6 +1,6 @@
 #pragma once
 #include <ostream>
-#include "ltnc/ast/Source.hxx"
+#include "ltnc/ast/Ast.hxx"
 #include "Config.hxx"
 namespace ltn::c {
 	class Backend {

ltnc/Ltnc.cxx

@@ -23,11 +23,11 @@ void ltn::c::Ltnc::compile(std::istream & in, const std::string &) {
 	this->line = 0;
 	lex::Lexer lexer{in, this->line};
 	auto source = parse::source(lexer);
-	for(auto && fx : source->functions) {
-		this->functions.push_back(std::move(fx));
+	for(auto && fx : source) {
+		this->program.functions.push_back(std::move(fx));
 	}
 }
 
 void ltn::c::Ltnc::yield(std::ostream & out) {
-	this->backend->compile(out, this->config, this->functions);
+	this->backend->compile(out, this->config, this->program.functions);
 }

ltnc/Ltnc.hxx

@@ -17,6 +17,6 @@ namespace ltn::c {
 		Config config;
 		std::size_t line = 1;
 		std::unique_ptr<Backend> backend;
-		std::vector<std::unique_ptr<ast::Functional>> functions;
+		ast::Program program;
 	};
 }

ltnc/ast/Ast.hxx

@@ -0,0 +1,13 @@
+#pragma once
+#include "Node.hxx"
+#include "Function.hxx"
+#include "Expression.hxx"
+#include "Statement.hxx"
+#include "Literals.hxx"
+#include "Assignable.hxx"
+
+namespace ltn::c::ast {
+	struct Program {
+		std::vector<std::unique_ptr<Functional>> functions;
+	};
+}

ltnc/compile/compiling.hxx

@@ -10,13 +10,7 @@
 #include "ExprCode.hxx"
 #include "ltnc/Config.hxx"
 #include "ltnc/CompilerError.hxx"
-#include "ltnc/ast/Node.hxx"
-#include "ltnc/ast/Source.hxx"
-#include "ltnc/ast/Function.hxx"
-#include "ltnc/ast/Expression.hxx"
-#include "ltnc/ast/Statement.hxx"
-#include "ltnc/ast/Literals.hxx"
-#include "ltnc/ast/Assignable.hxx"
+#include "ltnc/ast/Ast.hxx"
 
 namespace ltn::c::compile {
 	struct CompilerInfo {
@@ -27,8 +21,6 @@ namespace ltn::c::compile {
 	};
 
 
-	// Source
-	std::string source(const ast::Source & source, CompilerInfo & info);
 
 	// Functional
 	std::string functional(const ast::Functional & fx, CompilerInfo & info);

ltnc/parse/parsing.hxx

@@ -1,15 +1,11 @@
 #pragma once
-#include "ltnc/ast/Function.hxx"
-#include "ltnc/ast/Source.hxx"
-#include "ltnc/ast/Statement.hxx"
-#include "ltnc/ast/Assignable.hxx"
-#include "ltnc/ast/Literals.hxx"
+#include "ltnc/ast/Ast.hxx"
 #include "ltnc/lex/Lexer.hxx"
 
 namespace ltn::c::parse {
 
 	// Sources
-	std::unique_ptr<ast::Source> source(lex::Lexer & lexer);
+	std::vector<std::unique_ptr<ast::Functional>> source(lex::Lexer & lexer);
 
 	// Funcionals
 	std::unique_ptr<ast::Functional> functional(

ltnc/parse/parsingSource.cxx

@@ -65,7 +65,7 @@ namespace ltn::c::parse {
 		}
 	}
 
-	std::unique_ptr<ast::Source> source(lex::Lexer & lexer) {
+	std::vector<std::unique_ptr<ast::Functional>> source(lex::Lexer & lexer) {
 		Functionals functions;
 		ast::Namespace nameSpace;
 		while(!lexer.match(TT::___EOF___)) {
@@ -81,9 +81,7 @@ namespace ltn::c::parse {
 			else throw unknownDeclaration(lexer);
 		}
 		if(nameSpace.empty()) {
-			return std::make_unique<ast::Source>(
-				std::move(functions),
-				lexer.debug());
+			return functions; 
 		}
 		else throw unclosedNamespace(lexer);
 	}