Move object renaming logic to the main function

Author: jonas

bindgen/Main.cpp

@@ -42,14 +42,21 @@ int main(int argc, char *argv[]) {
         return -1;
     }
 
+    auto objectName = libName;
+    if (objectName == "native") {
+        /* there are at most 3 objects in the file.
+         * All of them will have distinct names. */
+        objectName = "nativeLib";
+    }
+
     auto stdhead = StdHeaders.getValue();
     if (!stdhead.empty()) {
         headerMan.LoadConfig(stdhead);
     }
 
     locations.clear();
 
-    IR ir(libName, Package.getValue());
+    IR ir(libName, objectName, Package.getValue());
     ScalaFrontendActionFactory actionFactory(ir);
 
     int result = Tool.run(&actionFactory);

bindgen/ir/IR.cpp

@@ -1,15 +1,9 @@
 #include "IR.h"
 #include "../Utils.h"
 
-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. */
-        libObjectName = "nativeLib";
-    } else {
-        libObjectName = this->libName;
-    }
+IR::IR(std::string libName, std::string objectName, std::string packageName)
+    : libName(std::move(libName)), objectName(std::move(objectName)),
+      packageName(packageName) {
 }
 
 void IR::addFunction(std::string name, std::vector<Parameter> parameters,
@@ -55,12 +49,12 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
           << "import scala.scalanative.native._\n\n";
     }
 
-    std::string libObjName = handleReservedWords(ir.libObjectName);
+    std::string objectName = handleReservedWords(ir.objectName);
 
     if (!ir.libObjEmpty()) {
         s << "@native.link(\"" << ir.libName << "\")\n"
           << "@native.extern\n"
-          << "object " << libObjName << " {\n";
+          << "object " << objectName << " {\n";
 
         for (const auto &typeDef : ir.typeDefs) {
             s << typeDef;
@@ -74,7 +68,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &s, const IR &ir) {
     }
 
     if (!ir.enums.empty() || ir.hasHelperMethods()) {
-        s << "import " << libObjName << "._\n\n";
+        s << "import " << objectName << "._\n\n";
     }
 
     if (!ir.enums.empty()) {

bindgen/ir/IR.h

@@ -11,7 +11,8 @@
  */
 class IR {
   public:
-    explicit IR(std::string libName, std::string packageName);
+    explicit IR(std::string libName, std::string objectName,
+                std::string packageName);
 
     void addFunction(std::string name, std::vector<Parameter> parameters,
                      std::string, bool isVariadic);
@@ -104,7 +105,7 @@ class IR {
     bool existsFunctionWithName(std::string functionName);
 
     std::string libName;       // name of the library
-    std::string libObjectName; // name of Scala object
+    std::string objectName;    // name of Scala object
     std::vector<Function> functions;
     std::vector<TypeDef> typeDefs;
     std::vector<Struct> structs;