Implement intermediate representation

Author: kornilova203

CMakeLists.txt

@@ -13,16 +13,31 @@ add_compile_options(-fexceptions -std=c++11)
 
 add_library(scalaNativeBindgen
   STATIC
-  ScalaFrontend.h
-  TreeVisitor.h
-  TreeVisitor.cpp
-  TreeConsumer.h
+  visitor/ScalaFrontendAction.h
+  visitor/ScalaFrontendAction.cpp
+  visitor/ScalaFrontendActionFactory.h
+  visitor/ScalaFrontendActionFactory.cpp
+  visitor/TreeVisitor.h
+  visitor/TreeVisitor.cpp
+  visitor/TreeConsumer.h
   TypeTranslator.h
   TypeTranslator.cpp
   HeaderManager.h
   HeaderManager.cpp
   CycleDetection.h
   Utils.h
+  ir/IR.h
+  ir/IR.cpp
+  ir/Struct.cpp
+  ir/Struct.h
+  ir/Function.cpp
+  ir/Function.h
+  ir/TypeDef.cpp
+  ir/TypeDef.h
+  ir/Enum.cpp
+  ir/Enum.h
+  ir/TypeAndName.cpp
+  ir/TypeAndName.h
   )
 
 add_executable(scalaBindgen

HeaderManager.cpp

@@ -1,7 +1,7 @@
 #include "HeaderManager.h"
 #include "Utils.h"
 
-#include "clang/Tooling/Tooling.h"
+#include <clang/Tooling/Tooling.h>
 
 #include <iostream>
 #include <fstream>

Main.cpp

@@ -1,5 +1,8 @@
-#include "ScalaFrontend.h"
+#include "visitor/ScalaFrontendAction.h"
+#include <sstream>
 #include "Utils.h"
+#include "visitor/ScalaFrontendActionFactory.h"
+#include <clang/Tooling/CommonOptionsParser.h>
 
 
 static llvm::cl::OptionCategory Category("Binding Generator");
@@ -14,60 +17,36 @@ int main(int argc, char *argv[]) {
     clang::tooling::CommonOptionsParser op(argc, (const char**)argv, Category);
     clang::tooling::ClangTool Tool(op.getCompilations(), op.getSourcePathList());
 
-    auto lib = LibName.getValue();
-    if(lib == ""){
-        llvm::errs() << "Error: Please specify the lib name using -name paramter\n";
+    auto libName = LibName.getValue();
+    if(libName.empty()){
+        llvm::errs() << "Error: Please specify the lib name using -name parameter\n";
         return -1;
     }
 
     auto stdhead = StdHeaders.getValue();
-    if(stdhead != ""){
+    if(!stdhead.empty()){
         headerMan.LoadConfig(stdhead);
     }
 
-    declarations = "";
-    enums = "";
-    helpers = "";
     locations.clear();
 
-    int result = Tool.run(clang::tooling::newFrontendActionFactory<ScalaFrontendAction>().get());
+    ScalaFrontendActionFactory actionFactory(libName);
 
-    auto printLoc = PrintHeadersLocation.getValue();
-
-    if(printLoc){
-        for(const auto& location: locations){
-            llvm::outs() << location;
-        }
-
-    } else {
-        if(declarations != "" || enums != "")
-        llvm::outs() << "import scala.scalanative._\n"
-                     << "import scala.scalanative.native._\n"
-                     << "import scala.scalanative.native.Nat._\n\n";
+    int result = Tool.run(&actionFactory);
 
-        if(declarations != ""){
-            llvm::outs() << "@native.link(\"" << lib << "\")\n"
-                         << "@native.extern\n"
-                         << "object " << lib << " {\n"
-                         << declarations
-                         << "}\n\n";
-        }
+    IR ir = actionFactory.getIntermediateRepresentation();
 
-        if(enums != "" || helpers != ""){
-            llvm::outs() << "import " + lib + "._\n\n";
-        }
+    auto printLoc = PrintHeadersLocation.getValue();
 
-        if(enums != ""){
-            llvm::outs() << "object " << lib << "Enums {\n"
-                         << enums
-                         << "}\n\n";
-        }
+    std::ostringstream s;
 
-        if(helpers != ""){
-            llvm::outs() << "object " << lib << "Helpers {\n"
-                         << helpers
-                         << "}\n\n";
+    if(printLoc){
+        for(const auto& location: locations) {
+            s << location.c_str();
         }
+    } else {
+        s << ir.generate();
     }
+    std::cout << s.str();
     return result;
 }