Merge pull request #128 from kornilova-l/function-parameters-shared_ptr

Store parameters in Function as vector of std::shared_ptr

Author: kornilova203

bindgen/ir/Function.cpp

@@ -5,7 +5,8 @@
 Parameter::Parameter(std::string name, std::shared_ptr<Type> type)
     : TypeAndName(std::move(name), type) {}
 
-Function::Function(const std::string &name, std::vector<Parameter *> parameters,
+Function::Function(const std::string &name,
+                   std::vector<std::shared_ptr<Parameter>> parameters,
                    std::shared_ptr<Type> retType, bool isVariadic)
     : name(name), scalaName(name), parameters(std::move(parameters)),
       retType(std::move(retType)), isVariadic(isVariadic) {}
@@ -31,12 +32,12 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const Function &func) {
 }
 
 bool Function::usesType(std::shared_ptr<Type> type, bool stopOnTypeDefs) const {
-    if (*retType == *type || retType.get()->usesType(type, stopOnTypeDefs)) {
+    if (*retType == *type || retType->usesType(type, stopOnTypeDefs)) {
         return true;
     }
     for (const auto &parameter : parameters) {
         if (*parameter->getType() == *type ||
-            parameter->getType().get()->usesType(type, stopOnTypeDefs)) {
+            parameter->getType()->usesType(type, stopOnTypeDefs)) {
             return true;
         }
     }
@@ -67,12 +68,6 @@ void Function::setScalaName(std::string scalaName) {
     this->scalaName = std::move(scalaName);
 }
 
-Function::~Function() {
-    for (const auto &parameter : parameters) {
-        delete parameter;
-    }
-}
-
 bool Function::isLegalScalaNativeFunction() const {
     /* Return type and parameters types cannot be array types because array type
      * in this case is always represented as a pointer to element type */

bindgen/ir/Function.h

@@ -14,11 +14,10 @@ class Parameter : public TypeAndName {
 
 class Function {
   public:
-    Function(const std::string &name, std::vector<Parameter *> parameters,
+    Function(const std::string &name,
+             std::vector<std::shared_ptr<Parameter>> parameters,
              std::shared_ptr<Type> retType, bool isVariadic);
 
-    ~Function();
-
     friend llvm::raw_ostream &operator<<(llvm::raw_ostream &s,
                                          const Function &func);
 
@@ -41,7 +40,7 @@ class Function {
 
     std::string name;      // real name of the function
     std::string scalaName; // not empty
-    std::vector<Parameter *> parameters;
+    std::vector<std::shared_ptr<Parameter>> parameters;
     std::shared_ptr<Type> retType;
     bool isVariadic;
 };

bindgen/ir/IR.cpp

@@ -7,7 +7,8 @@ IR::IR(std::string libName, std::string linkName, std::string objectName,
       objectName(std::move(objectName)), locationManager(locationManager),
       packageName(std::move(packageName)) {}
 
-void IR::addFunction(std::string name, std::vector<Parameter *> parameters,
+void IR::addFunction(std::string name,
+                     std::vector<std::shared_ptr<Parameter>> parameters,
                      std::shared_ptr<Type> retType, bool isVariadic) {
     functions.push_back(std::make_shared<Function>(name, std::move(parameters),
                                                    retType, isVariadic));

bindgen/ir/IR.h

@@ -20,7 +20,8 @@ class IR {
 
     ~IR();
 
-    void addFunction(std::string name, std::vector<Parameter *> parameters,
+    void addFunction(std::string name,
+                     std::vector<std::shared_ptr<Parameter>> parameters,
                      std::shared_ptr<Type> retType, bool isVariadic);
 
     std::shared_ptr<TypeDef> addTypeDef(std::string name,

bindgen/visitor/TreeVisitor.cpp

@@ -1,6 +1,5 @@
 #include "TreeVisitor.h"
 #include "clang/AST/RecordLayout.h"
-#include <stdio.h>
 
 bool TreeVisitor::VisitFunctionDecl(clang::FunctionDecl *func) {
     if (!astContext->getSourceManager().isInMainFile(func->getLocation())) {
@@ -10,7 +9,7 @@ bool TreeVisitor::VisitFunctionDecl(clang::FunctionDecl *func) {
     std::string funcName = func->getNameInfo().getName().getAsString();
     std::shared_ptr<Type> retType =
         typeTranslator.translate(func->getReturnType());
-    std::vector<Parameter *> parameters;
+    std::vector<std::shared_ptr<Parameter>> parameters;
 
     int anonCounter = 0;
 
@@ -23,7 +22,7 @@ bool TreeVisitor::VisitFunctionDecl(clang::FunctionDecl *func) {
         }
 
         std::shared_ptr<Type> ptype = typeTranslator.translate(parm->getType());
-        parameters.emplace_back(new Parameter(pname, ptype));
+        parameters.emplace_back(std::make_shared<Parameter>(pname, ptype));
     }
 
     ir.addFunction(funcName, std::move(parameters), retType,