Remove HeaderManager and locations

Author: kornilova203

bindgen/CMakeLists.txt

@@ -36,8 +36,6 @@ add_executable(bindgen
   defines/DefineFinderActionFactory.h
   TypeTranslator.h
   TypeTranslator.cpp
-  HeaderManager.h
-  HeaderManager.cpp
   CycleDetection.h
   Utils.h
   ir/IR.h

bindgen/HeaderManager.cpp

@@ -11,19 +11,7 @@ int main(int argc, const char *argv[]) {
 
     llvm::cl::opt<std::string> LibName("name", llvm::cl::cat(Category),
                                        llvm::cl::desc("Library name"));
-    llvm::cl::opt<std::string> StdHeaders(
-        "std-headers", llvm::cl::cat(Category),
-        llvm::cl::desc("Path to a file with the list of headers for which "
-                       "bindings\n"
-                       "will not be generated. "
-                       "The list contains header files names\n"
-                       "and package names that contain bindings for these "
-                       "headers.\nExample:\n"
-                       "math.h=scala.scalanative.native.math\n"
-                       "stdlib.h=scala.scalanative.native.stdlib"));
-    llvm::cl::opt<bool> PrintHeadersLocation(
-        "location", llvm::cl::cat(Category),
-        llvm::cl::desc("Print list of parsed headers"));
+
     llvm::cl::opt<std::string> ExcludePrefix(
         "exclude-prefix", llvm::cl::cat(Category),
         llvm::cl::desc("Functions and unused typedefs will be removed if their "
@@ -64,13 +52,6 @@ int main(int argc, const char *argv[]) {
         objectName = "nativeLib";
     }
 
-    auto stdhead = StdHeaders.getValue();
-    if (!stdhead.empty()) {
-        headerMan.LoadConfig(stdhead);
-    }
-
-    locations.clear();
-
     IR ir(libName, linkName, objectName, Package.getValue());
 
     DefineFinderActionFactory defineFinderActionFactory(ir);
@@ -87,15 +68,8 @@ int main(int argc, const char *argv[]) {
     ScalaFrontendActionFactory actionFactory(ir, locationManager);
     result = Tool.run(&actionFactory);
 
-    auto printLoc = PrintHeadersLocation.getValue();
-    if (printLoc) {
-        for (const auto &location : locations) {
-            llvm::outs() << location.c_str();
-        }
-    } else {
-        ir.generate(ExcludePrefix.getValue());
-        llvm::outs() << ir;
-    }
+    ir.generate(ExcludePrefix.getValue());
+    llvm::outs() << ir;
     llvm::outs().flush();
     return result;
 }

bindgen/HeaderManager.h

@@ -20,12 +20,7 @@ class TreeConsumer : public clang::ASTConsumer {
         // a DeclGroupRef may have multiple Decls, so we iterate through each
         // one
         for (auto D : DG) {
-            std::string fpath = smanager.getFilename(D->getLocation()).str();
-
-            if (!headerMan.IsStandard(basename(fpath)) && !fpath.empty()) {
-                locations.insert(basename(fpath) + "\n");
-                visitor.TraverseDecl(D);
-            }
+            visitor.TraverseDecl(D);
         }
         return true;
     }

bindgen/Main.cpp

@@ -1,7 +1,5 @@
 #include "TreeVisitor.h"
 
-HeaderManager headerMan;
-
 std::set<std::string> locations;
 
 bool TreeVisitor::VisitFunctionDecl(clang::FunctionDecl *func) {

bindgen/visitor/TreeConsumer.h

@@ -1,17 +1,12 @@
 #pragma once
 
 #include "../CycleDetection.h"
-#include "../HeaderManager.h"
 #include "../TypeTranslator.h"
 #include "../ir/IR.h"
 #include "../ir/location/LocationManager.h"
 #include <clang/AST/RecursiveASTVisitor.h>
 #include <clang/Frontend/CompilerInstance.h>
 
-extern HeaderManager headerMan;
-
-extern std::set<std::string> locations;
-
 class TreeVisitor : public clang::RecursiveASTVisitor<TreeVisitor> {
   private:
     clang::ASTContext *astContext;