Use ANTLR4 for PreProcessor

.gitignore

@@ -4,4 +4,5 @@ build/
 install/
 .devcontainer
 .DS_Store
-exclude
+exclude
+.antlr/

CMakeLists.txt

@@ -23,6 +23,10 @@ elseif(WIN32)
 endif(UNIX)
 
 include_directories(${CMAKE_CURRENT_LIST_DIR}/src/include)
+
+
+add_subdirectory(external)
+link_directories(${PROJECT_BINARY_DIR}/external/antlr4_runtime/src/antlr4_runtime-install/lib)
 add_subdirectory(src)
 
 set(BUILD_TESTS ON CACHE BOOL "Build tests")

src/CMakeLists.txt

@@ -1,15 +1,7 @@
+add_subdirectory(lib/PreProcessor)
+
 add_library(cc
   lib/Compiler.cpp
-  lib/SourceStream.cpp
-  lib/PreProcessor/PreProcessor.cpp
-  lib/PreProcessor/Scanner.cpp
-  lib/PreProcessor/Macro.cpp
-  lib/PreProcessor/Expression.cpp
-  lib/Token.cpp
-  lib/Lexer.cpp
-  lib/Parser.cpp
-  lib/AST/Expr.cpp
-  lib/AST/Dump.cpp
 )
 
 add_executable(wasmvm-cc
@@ -21,6 +13,8 @@ add_executable(wasmvm-cc
 target_link_libraries(wasmvm-cc
   WasmVM
   cc
+  pp
+  antlr4-runtime
 )
 target_compile_definitions(wasmvm-cc PUBLIC
   DEFAULT_LOOKUP_PATH="${DEFAULT_LOOKUP_PATH}"

src/exec/wasmvm-cc.cpp

@@ -134,18 +134,19 @@ int main(int argc, const char* argv[]){
         // Preprocess
         if(args["pp"]){
             for(std::filesystem::path source_path : source_files){
-                PreProcessor pp(source_path);
-                if(args["output"]){
-                    std::ofstream output_file(std::get<std::string>(args["output"].value()));
-                    for(PreProcessor::PPToken tok = pp.get(); tok.has_value(); tok = pp.get()){
-                        output_file << tok.value();
-                    }
-                    output_file.close();
-                }else{
-                    for(PreProcessor::PPToken tok = pp.get(); tok.has_value(); tok = pp.get()){
-                        std::cout << tok.value();
-                    }
-                }
+                std::ifstream fin(source_path);
+                PreProcessor pp(source_path, fin);
+                // if(args["output"]){
+                //     std::ofstream output_file(std::get<std::string>(args["output"].value()));
+                //     for(PreProcessor::PPToken tok = pp.get(); tok.has_value(); tok = pp.get()){
+                //         output_file << tok.value();
+                //     }
+                //     output_file.close();
+                // }else{
+                //     for(PreProcessor::PPToken tok = pp.get(); tok.has_value(); tok = pp.get()){
+                //         std::cout << tok.value();
+                //     }
+                // }
             }
             return 0;
         }
@@ -194,9 +195,9 @@ int main(int argc, const char* argv[]){
         }
         Linker linker(linker_config);
 
-    }catch(Exception::Error &e){
-        std::cerr << e.pos << ": " COLOR_Error ": " << e.what() << std::endl;
-        return -1;
+    // }catch(Exception::Error &e){
+    //     std::cerr << e.pos << ": " COLOR_Error ": " << e.what() << std::endl;
+    //     return -1;
     }catch(Exception::Exception &e){
         std::cerr << args.program.filename().string() << ": " COLOR_Error ": " << e.what() << std::endl;
         return -1;

src/include/Error.hpp

@@ -2,19 +2,18 @@
 #define WVMCC_Error_DEF
 
 #include <exception.hpp>
-#include <SourceStream.hpp>
 
 namespace WasmVM {
 namespace Exception {
 
-struct Error : public Exception {
-    Error(SourcePos pos, std::string msg) : Exception(msg), pos(pos){}
-    SourcePos pos;
-};
+// struct Error : public Exception {
+//     Error(SourcePos pos, std::string msg) : Exception(msg), pos(pos){}
+//     SourcePos pos;
+// };
 
-struct SyntaxError : public Error {
-    SyntaxError(SourcePos pos, std::string msg) : Error(pos, "syntax error:" + msg){}
-};
+// struct SyntaxError : public Error {
+//     SyntaxError(SourcePos pos, std::string msg) : Error(pos, "syntax error:" + msg){}
+// };
 
 } // namespace WasmVM
 } // namespace WasmVM