Merge pull request #113 from kornilova-l/only-declarations-from-origi…

…nal-header

Filter functions, extern vars, defines and unused types from included headers

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
@@ -72,6 +70,10 @@ add_executable(bindgen
   ir/types/FunctionPointerType.h
   ir/types/ArrayType.cpp
   ir/types/ArrayType.h
+  ir/Location.h
+  ir/Location.cpp
+  ir/LocationManager.h
+  ir/LocationManager.cpp
 )
 
 if (STATIC_LINKING)

bindgen/Main.cpp

@@ -1,4 +1,5 @@
 #include "defines/DefineFinderActionFactory.h"
+#include "ir/LocationManager.h"
 #include "visitor/ScalaFrontendActionFactory.h"
 #include <clang/Tooling/CommonOptionsParser.h>
 
@@ -11,19 +12,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 "
@@ -41,6 +30,12 @@ int main(int argc, const char *argv[]) {
     clang::tooling::ClangTool Tool(op.getCompilations(),
                                    op.getSourcePathList());
 
+    if (op.getSourcePathList().size() != 1) {
+        llvm::errs() << "Error: Only one file may be processed at a time.\n";
+        llvm::errs().flush();
+        return -1;
+    }
+
     auto libName = LibName.getValue();
     if (libName.empty()) {
         llvm::errs()
@@ -64,14 +59,10 @@ int main(int argc, const char *argv[]) {
         objectName = "nativeLib";
     }
 
-    auto stdhead = StdHeaders.getValue();
-    if (!stdhead.empty()) {
-        headerMan.LoadConfig(stdhead);
-    }
-
-    locations.clear();
+    char *resolved = realpath(op.getSourcePathList()[0].c_str(), nullptr);
+    LocationManager locationManager(resolved);
 
-    IR ir(libName, linkName, objectName, Package.getValue());
+    IR ir(libName, linkName, objectName, Package.getValue(), locationManager);
 
     DefineFinderActionFactory defineFinderActionFactory(ir);
     int result = Tool.run(&defineFinderActionFactory);
@@ -82,15 +73,8 @@ int main(int argc, const char *argv[]) {
     ScalaFrontendActionFactory actionFactory(ir);
     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/TypeTranslator.cpp

@@ -102,7 +102,7 @@ TypeTranslator::translateStructOrUnionOrEnum(const clang::QualType &qtpe) {
     /* type is not yet defined.
      * TypeDef with nullptr will be created.
      * nullptr will be replaced by actual type when the type is declared. */
-    typeDef = ir.addTypeDef(nameWithoutSpace, nullptr);
+    typeDef = ir.addTypeDef(nameWithoutSpace, nullptr, nullptr);
     return typeDef;
 }
 

bindgen/defines/DefineFinder.cpp

@@ -11,6 +11,10 @@ DefineFinder::DefineFinder(IR &ir, const clang::CompilerInstance &compiler,
 void DefineFinder::MacroDefined(const clang::Token &macroNameTok,
                                 const clang::MacroDirective *md) {
     clang::SourceManager &sm = compiler.getSourceManager();
+    if (!sm.isInMainFile(md->getLocation())) {
+        /* include defines only from the original header */
+        return;
+    }
     if (sm.isWrittenInMainFile(macroNameTok.getLocation()) && md->isDefined() &&
         !md->getMacroInfo()->isFunctionLike()) {
         /* save defines only from the given header.
@@ -100,6 +104,9 @@ void DefineFinder::MacroUndefined(const clang::Token &macroNameTok,
                                   const clang::MacroDefinition &md,
                                   const clang::MacroDirective *undef) {
     clang::SourceManager &sm = compiler.getSourceManager();
+    if (!sm.isInMainFile(undef->getLocation())) {
+        return;
+    }
     if (sm.isWrittenInMainFile(macroNameTok.getLocation()) &&
         md.getMacroInfo() && !md.getMacroInfo()->isFunctionLike()) {
         std::string macroName = macroNameTok.getIdentifierInfo()->getName();

bindgen/ir/Enum.cpp

@@ -8,15 +8,16 @@ std::string Enumerator::getName() { return name; }
 int64_t Enumerator::getValue() { return value; }
 
 Enum::Enum(std::string name, std::string type,
-           std::vector<Enumerator> enumerators)
+           std::vector<Enumerator> enumerators,
+           std::shared_ptr<Location> location)
     : PrimitiveType(std::move(type)), name(std::move(name)),
-      enumerators(std::move(enumerators)) {}
+      enumerators(std::move(enumerators)), location(std::move(location)) {}
 
 bool Enum::isAnonymous() const { return name.empty(); }
 
 std::shared_ptr<TypeDef> Enum::generateTypeDef() {
-    assert(!isAnonymous());
-    return std::make_shared<TypeDef>("enum_" + name, shared_from_this());
+    return std::make_shared<TypeDef>(getTypeAlias(), shared_from_this(),
+                                     nullptr);
 }
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Enum &e) {
@@ -49,3 +50,10 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Enum &e) {
 }
 
 std::string Enum::getName() const { return name; }
+
+std::string Enum::getTypeAlias() const {
+    assert(!isAnonymous());
+    return "enum_" + name;
+}
+
+std::shared_ptr<Location> Enum::getLocation() const { return location; }

bindgen/ir/Enum.h

@@ -21,7 +21,8 @@ class Enumerator {
 class Enum : public PrimitiveType, public std::enable_shared_from_this<Enum> {
   public:
     Enum(std::string name, std::string type,
-         std::vector<Enumerator> enumerators);
+         std::vector<Enumerator> enumerators,
+         std::shared_ptr<Location> location);
 
     bool isAnonymous() const;
 
@@ -31,9 +32,14 @@ class Enum : public PrimitiveType, public std::enable_shared_from_this<Enum> {
 
     friend llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Enum &e);
 
+    std::string getTypeAlias() const;
+
+    std::shared_ptr<Location> getLocation() const;
+
   private:
     std::string name; // might be empty
     std::vector<Enumerator> enumerators;
+    std::shared_ptr<Location> location;
 };
 
 #endif // SCALA_NATIVE_BINDGEN_ENUM_H