Cleaned up structure

CMakeLists.txt

@@ -12,4 +12,6 @@ file(GLOB_RECURSE SOURCES
     src/**/*.cpp)
 add_executable(brb ${SOURCES})
 
+target_include_directories(brb PRIVATE ${CMAKE_SOURCE_DIR}/src)
+
 target_link_libraries(brb llvm)

src/Compiler/CodeGenerator.h

@@ -3,13 +3,13 @@
 
 #include <iostream>
 
-#include "llvm/IR/Module.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/Target/TargetMachine.h"
-#include "llvm/MC/TargetRegistry.h"
-#include "llvm/Support/TargetSelect.h"
-#include "llvm/TargetParser/Host.h"
+#include <llvm/IR/Module.h>
+#include <llvm/Support/FileSystem.h>
+#include <llvm/IR/LegacyPassManager.h>
+#include <llvm/Target/TargetMachine.h>
+#include <llvm/MC/TargetRegistry.h>
+#include <llvm/Support/TargetSelect.h>
+#include <llvm/TargetParser/Host.h>
 
 using namespace std;
 

src/Compiler/ModuleBuilder.h

@@ -3,15 +3,15 @@
 
 #include <map>
 
-#include "llvm/IR/Module.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/IR/Verifier.h"
+#include <llvm/IR/Module.h>
+#include <llvm/IR/IRBuilder.h>
+#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Constants.h>
+#include <llvm/Support/raw_ostream.h>
+#include <llvm/IR/Verifier.h>
 
-#include "Expression.h"
-#include "Statement.h"
+#include "Parser/Expression.h"
+#include "Parser/Statement.h"
 
 using namespace std;
 

src/Parser/Expression.h

@@ -1,7 +1,7 @@
 #ifndef EXPRESSION_H
 #define EXPRESSION_H
 
-#include "Token.h"
+#include "Lexer/Token.h"
 #include "Statement.h"
 #include "Types.h"
 

src/Parser/Parser.h

@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "Token.h"
+#include "Lexer/Token.h"
 #include "Expression.h"
 #include "Statement.h"
 

src/Parser/Statement.h

@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-#include "Token.h"
+#include "Lexer/Token.h"
 #include "Expression.h"
 #include "Types.h"
 

src/main.cpp

@@ -2,16 +2,16 @@
 #include <fstream>
 #include <filesystem>
 
-#include "llvm/Support/CommandLine.h"
+#include <llvm/Support/CommandLine.h>
 
-#include "Token.h"
-#include "Lexer.h"
+#include "Lexer/Token.h"
+#include "Lexer/Lexer.h"
 
-#include "Expression.h"
-#include "Parser.h"
+#include "Parser/Expression.h"
+#include "Parser/Parser.h"
 
-#include "ModuleBuilder.h"
-#include "CodeGenerator.h"
+#include "Compiler/ModuleBuilder.h"
+#include "Compiler/CodeGenerator.h"
 
 
 using namespace std;
@@ -80,8 +80,8 @@ int main(int argc, char **argv) {
         module->print(llvm::outs(), nullptr);
     }
 
-    CodeGenerator codeGenerator(module);
-    codeGenerator.generateObjectFile(outputKind);
+    //CodeGenerator codeGenerator(module);
+    //codeGenerator.generateObjectFile(outputKind);
 
     return 0;
 }