Pass the package name directly to the IR constructor

Author: jonas

bindgen/Main.cpp

@@ -49,11 +49,7 @@ int main(int argc, char *argv[]) {
 
     locations.clear();
 
-    IR ir(libName);
-    if (!Package.empty()) {
-        ir.setPackageName(Package.getValue());
-    }
-
+    IR ir(libName, Package.getValue());
     ScalaFrontendActionFactory actionFactory(ir);
 
     int result = Tool.run(&actionFactory);

bindgen/ir/IR.cpp

@@ -1,7 +1,8 @@
 #include "IR.h"
 #include "../Utils.h"
 
-IR::IR(std::string libName) : libName(std::move(libName)) {
+IR::IR(std::string libName, std::string packageName)
+    : libName(std::move(libName)), packageName(packageName) {
     if (this->libName == "native") {
         /* there are at most 3 objects in the file.
          * All of them will have distinct names. */
@@ -207,10 +208,6 @@ bool IR::typeIsUsedOnlyInTypeDefs(std::string type) {
              isTypeUsed(unions, type));
 }
 
-void IR::setPackageName(std::string packageName) {
-    this->packageName = std::move(packageName);
-}
-
 void IR::setScalaNames() {
     /* Renaming according to Scala naming conventions
      * should happen here */

bindgen/ir/IR.h

@@ -11,7 +11,7 @@
  */
 class IR {
   public:
-    explicit IR(std::string libName);
+    explicit IR(std::string libName, std::string packageName);
 
     void addFunction(std::string name, std::vector<Parameter> parameters,
                      std::string, bool isVariadic);
@@ -39,8 +39,6 @@ class IR {
 
     void generate(const std::string &excludePrefix);
 
-    void setPackageName(std::string packageName);
-
   private:
     /**
      * Generates type defs for enums, structs and unions