Merge pull request #139 from kornilova-l/locatable-type

Implement LocatableType class

Author: kornilova203

bindgen/CMakeLists.txt

@@ -74,6 +74,8 @@ add_executable(bindgen
   ir/Location.cpp
   ir/LocationManager.h
   ir/LocationManager.cpp
+  ir/LocatableType.cpp
+  ir/LocatableType.h
 )
 
 if (STATIC_LINKING)

bindgen/ir/Enum.cpp

@@ -10,8 +10,8 @@ int64_t Enumerator::getValue() { return value; }
 Enum::Enum(std::string name, std::string type,
            std::vector<Enumerator> enumerators,
            std::shared_ptr<Location> location)
-    : PrimitiveType(std::move(type)), name(std::move(name)),
-      enumerators(std::move(enumerators)), location(std::move(location)) {}
+    : PrimitiveType(std::move(type)), LocatableType(std::move(location)),
+      name(std::move(name)), enumerators(std::move(enumerators)) {}
 
 bool Enum::isAnonymous() const { return name.empty(); }
 
@@ -55,5 +55,3 @@ std::string Enum::getTypeAlias() const {
     assert(!isAnonymous());
     return "enum_" + name;
 }
-
-std::shared_ptr<Location> Enum::getLocation() const { return location; }

bindgen/ir/Enum.h

@@ -1,6 +1,7 @@
 #ifndef SCALA_NATIVE_BINDGEN_ENUM_H
 #define SCALA_NATIVE_BINDGEN_ENUM_H
 
+#include "LocatableType.h"
 #include "TypeDef.h"
 #include "types/PrimitiveType.h"
 #include <vector>
@@ -18,7 +19,7 @@ class Enumerator {
     int64_t value;
 };
 
-class Enum : public PrimitiveType {
+class Enum : public PrimitiveType, public LocatableType {
   public:
     Enum(std::string name, std::string type,
          std::vector<Enumerator> enumerators,
@@ -34,12 +35,9 @@ class Enum : public PrimitiveType {
 
     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

bindgen/ir/Function.cpp

@@ -31,7 +31,8 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Function &func) {
     return s;
 }
 
-bool Function::usesType(std::shared_ptr<Type> type, bool stopOnTypeDefs) const {
+bool Function::usesType(std::shared_ptr<const Type> type,
+                        bool stopOnTypeDefs) const {
     if (*retType == *type || retType->usesType(type, stopOnTypeDefs)) {
         return true;
     }

bindgen/ir/Function.h

@@ -21,7 +21,7 @@ class Function {
     friend llvm::raw_ostream &operator<<(llvm::raw_ostream &s,
                                          const Function &func);
 
-    bool usesType(std::shared_ptr<Type> type, bool stopOnTypeDefs) const;
+    bool usesType(std::shared_ptr<const Type> type, bool stopOnTypeDefs) const;
 
     std::string getName() const;
 

bindgen/ir/IR.cpp

@@ -116,8 +116,9 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
     for (const auto &typeDef : ir.typeDefs) {
         if (ir.shouldOutput(typeDef)) {
             s << *typeDef;
-        } else if (isAliasForOpaqueType(typeDef.get()) &&
-                   ir.inMainFile(*typeDef)) {
+        } else if (typeDef->hasLocation() &&
+                   isAliasForOpaqueType(typeDef.get()) &&
+                   ir.locationManager.inMainFile(*typeDef->getLocation())) {
             llvm::errs() << "Warning: type alias " + typeDef->getName()
                          << " is skipped because it is an unused alias for "
                             "incomplete type."
@@ -271,7 +272,8 @@ void IR::replaceTypeInTypeDefs(std::shared_ptr<const Type> oldType,
 
 template <typename T>
 bool IR::isTypeUsed(const std::vector<T> &declarations,
-                    std::shared_ptr<Type> type, bool stopOnTypeDefs) const {
+                    std::shared_ptr<const Type> type,
+                    bool stopOnTypeDefs) const {
     for (const auto &decl : declarations) {
         if (decl->usesType(type, stopOnTypeDefs)) {
             return true;
@@ -280,7 +282,8 @@ bool IR::isTypeUsed(const std::vector<T> &declarations,
     return false;
 }
 
-bool IR::typeIsUsedOnlyInTypeDefs(const std::shared_ptr<Type> &type) const {
+bool IR::typeIsUsedOnlyInTypeDefs(
+    const std::shared_ptr<const Type> &type) const {
     /* varDefines are not checked here because they are simply
      * aliases for variables.*/
     return !(
@@ -289,7 +292,7 @@ bool IR::typeIsUsedOnlyInTypeDefs(const std::shared_ptr<Type> &type) const {
         isTypeUsed(literalDefines, type, true));
 }
 
-bool IR::isTypeUsed(const std::shared_ptr<Type> &type,
+bool IR::isTypeUsed(const std::shared_ptr<const Type> &type,
                     bool checkRecursively) const {
     if (checkRecursively) {
         if (isTypeUsed(functions, type, true) ||
@@ -437,26 +440,6 @@ IR::~IR() {
     varDefines.clear();
 }
 
-template <typename T> bool IR::inMainFile(const T &type) const {
-    std::shared_ptr<Location> location = type.getLocation();
-    if (!location) {
-        /* generated TypeDef */
-        auto *typeDef = dynamic_cast<const TypeDef *>(&type);
-        assert(typeDef);
-        const Type *innerType = typeDef->getType().get();
-        if (isInstanceOf<Struct>(innerType)) {
-            return inMainFile(*dynamic_cast<const Struct *>(innerType));
-        }
-        if (isInstanceOf<Union>(innerType)) {
-            return inMainFile(*dynamic_cast<const Union *>(innerType));
-        }
-        if (isInstanceOf<Enum>(innerType)) {
-            return inMainFile(*dynamic_cast<const Enum *>(innerType));
-        }
-    }
-    return location && locationManager.inMainFile(*location);
-}
-
 template <typename T>
 bool IR::hasOutputtedDeclaration(
     const std::vector<std::shared_ptr<T>> &declarations) const {
@@ -468,20 +451,13 @@ bool IR::hasOutputtedDeclaration(
     return false;
 }
 
-template <typename T>
-bool IR::shouldOutput(const std::shared_ptr<T> &type) const {
+bool IR::shouldOutput(const std::shared_ptr<const LocatableType> &type) const {
     if (isTypeUsed(type, true)) {
         return true;
     }
-    if (!inMainFile(*type)) {
-        /* remove unused types from included files */
+    if (isAliasForOpaqueType(type.get())) {
         return false;
     }
-    auto *typeDef = dynamic_cast<TypeDef *>(type.get());
-    if (typeDef) {
-        /* unused typedefs from main file are printed only if they are not
-         * aliases for an opaque type. */
-        return !isAliasForOpaqueType(typeDef);
-    }
-    return true;
+    /* remove unused types from included files */
+    return locationManager.inMainFile(*type->getLocation());
 }

bindgen/ir/IR.h

@@ -114,22 +114,24 @@ class IR {
     /**
      * @return true if given type is used only in typedefs.
      */
-    bool typeIsUsedOnlyInTypeDefs(const std::shared_ptr<Type> &type) const;
+    bool
+    typeIsUsedOnlyInTypeDefs(const std::shared_ptr<const Type> &type) const;
 
     /**
      * @param checkRecursively if this parameter is true then the method will
      * output false if the type is used only in unused types
      * @return true if type is used in one of declarations
      */
-    bool isTypeUsed(const std::shared_ptr<Type> &type,
+    bool isTypeUsed(const std::shared_ptr<const Type> &type,
                     bool checkRecursively = false) const;
 
     /**
      * @return true if type is used in one of given declarations.
      */
     template <typename T>
     bool isTypeUsed(const std::vector<T> &declarations,
-                    std::shared_ptr<Type> type, bool stopOnTypeDefs) const;
+                    std::shared_ptr<const Type> type,
+                    bool stopOnTypeDefs) const;
 
     void setScalaNames();
 
@@ -146,19 +148,15 @@ class IR {
     T getDeclarationWithName(const std::vector<T> &declarations,
                              const std::string &name) const;
 
-    template <typename T> bool inMainFile(const T &type) const;
-
     /**
-     * @tparam T Enum, Struct, Union or TypeDef
      * @return true if the type will be printed.
      *         Following types are not printed:
      *         - Unused types from included headers
      *         - Unused typedefs from main header if they reference an opaque
      *           type (if such typedef is used then true is returned but error
      *           message is printed when bindings are generated)
      */
-    template <typename T>
-    bool shouldOutput(const std::shared_ptr<T> &type) const;
+    bool shouldOutput(const std::shared_ptr<const LocatableType> &type) const;
 
     /**
      * @tparam T Struct or Union

bindgen/ir/LiteralDefine.cpp

@@ -11,7 +11,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s,
     return s;
 }
 
-bool LiteralDefine::usesType(const std::shared_ptr<Type> &type,
+bool LiteralDefine::usesType(const std::shared_ptr<const Type> &type,
                              bool stopOnTypeDefs) const {
     return *this->type == *type ||
            this->type.get()->usesType(type, stopOnTypeDefs);

bindgen/ir/LiteralDefine.h

@@ -13,7 +13,8 @@ class LiteralDefine : public Define {
     friend llvm::raw_ostream &operator<<(llvm::raw_ostream &s,
                                          const LiteralDefine &literalDefine);
 
-    bool usesType(const std::shared_ptr<Type> &type, bool stopOnTypeDefs) const;
+    bool usesType(const std::shared_ptr<const Type> &type,
+                  bool stopOnTypeDefs) const;
 
   private:
     std::string literal;

bindgen/ir/LocatableType.cpp

@@ -0,0 +1,8 @@
+#include "LocatableType.h"
+
+LocatableType::LocatableType(std::shared_ptr<Location> location)
+    : location(std::move(location)) {}
+
+std::shared_ptr<Location> LocatableType::getLocation() const {
+    return location;
+}