Support multiple headers for one scala object

Author: kornilova203

bindgen/ir/Location.h

@@ -12,7 +12,7 @@ class Location {
     int getLineNumber() const;
 
   private:
-    std::string path;
+    std::string path; // may be empty
     int lineNumber;
 };
 

bindgen/ir/LocationManager.cpp

@@ -24,10 +24,13 @@ bool LocationManager::inMainFile(const Location &location) const {
 }
 
 bool LocationManager::isImported(const Location &location) const {
+    if (location.getPath().empty()) {
+        return false;
+    }
     for (auto it = config.begin(); it != config.end(); ++it) {
-        json libObject = it.value();
-        for (const auto &header : libObject["headers"]) {
-            if (equal(header, location)) {
+        json lib = it.value();
+        for (const auto &object : lib["objects"]) {
+            if (equal(object, location)) {
                 return true;
             }
         }
@@ -36,41 +39,63 @@ bool LocationManager::isImported(const Location &location) const {
 }
 
 bool LocationManager::equal(json header, const Location &location) const {
-    std::string headerName = getHeaderName(header);
-    return endsWith(location.getPath(), headerName);
+    for (const std::string &headerName : getHeaderNames(header)) {
+        if (endsWith(location.getPath(), "/" + headerName)) {
+            return true;
+        }
+    }
+    return false;
 }
 
-std::string
-LocationManager::getContainingObject(const Location &location) const {
+std::string LocationManager::getImportedType(const Location &location,
+                                             const std::string &name) const {
     for (auto it = config.begin(); it != config.end(); ++it) {
-        json libObject = it.value();
-        for (const json &header : libObject["headers"]) {
-            if (equal(header, location)) {
-                return getContainingObject(libObject, header);
+        json lib = it.value();
+        for (const json &object : lib["objects"]) {
+            if (equal(object, location)) {
+                std::string scalaObject = getContainingObject(lib, object);
+                if (lib.find("names") != lib.end()) {
+                    /* name mapping */
+                    json names = lib["names"];
+                    if (names.find(name) != names.end()) {
+                        return scalaObject + "." +
+                               names[name].get<std::string>();
+                    }
+                }
+                return scalaObject + "." + handleReservedWords(name);
             }
         }
     }
     throw std::logic_error("Location: " + location.getPath() +
                            " does not belong to any known library");
 }
 
-std::string LocationManager::getHeaderName(const json &header) const {
+std::vector<std::string>
+LocationManager::getHeaderNames(const json &header) const {
+    std::vector<std::string> headerNames;
     if (header.is_string()) {
-        return header.get<std::string>();
-    } else {
-        return header["header"].get<std::string>();
+        headerNames.push_back(header.get<std::string>());
+    } else if (header.is_object()) {
+        if (header.find("header") != header.end()) {
+            headerNames.push_back(header["header"].get<std::string>());
+        } else {
+            for (const json &h : header["headers"]) {
+                headerNames.push_back(h.get<std::string>());
+            }
+        }
     }
+    return headerNames;
 }
 
-std::string LocationManager::getContainingObject(const json &libObject,
+std::string LocationManager::getContainingObject(const json &lib,
                                                  const json &header) const {
     std::string package;
     std::string name;
-    if (libObject.find("package") != libObject.end()) {
-        package = libObject["package"].get<std::string>();
+    if (lib.find("package") != lib.end()) {
+        package = lib["package"].get<std::string>();
     }
-    if (libObject.find("name") != libObject.end()) {
-        package = libObject["name"].get<std::string>();
+    if (lib.find("name") != lib.end()) {
+        package = lib["name"].get<std::string>();
     }
     if (header.is_object()) {
         /* override default values */
@@ -83,7 +108,9 @@ std::string LocationManager::getContainingObject(const json &libObject,
     }
     if (name.empty()) {
         /* extract object name from header name */
-        name = getHeaderName(header);
+        std::vector<std::string> names = getHeaderNames(header);
+        assert(names.size() == 1);
+        name = names[0];
         auto slashPos = name.find_last_of('/');
         if (slashPos != std::string::npos) {
             name = name.substr(slashPos + 1, name.length());

bindgen/ir/LocationManager.h

@@ -21,18 +21,18 @@ class LocationManager {
      */
     bool isImported(const Location &location) const;
 
-    std::string getContainingObject(const Location &location) const;
+    std::string getImportedType(const Location &location,
+                                const std::string &name) const;
 
   private:
     std::string mainHeaderPath;
     json config;
 
     bool equal(json header, const Location &location) const;
 
-    std::string getHeaderName(const json &header) const;
+    std::vector<std::string> getHeaderNames(const json &header) const;
 
-    std::string getContainingObject(const json &libObject,
-                                    const json &header) const;
+    std::string getContainingObject(const json &lib, const json &header) const;
 };
 
 #endif // SCALA_NATIVE_BINDGEN_LOCATIONMANAGER_H

bindgen/ir/TypeDef.cpp

@@ -46,9 +46,7 @@ std::string TypeDef::str(const LocationManager &locationManager) const {
     if (hasLocation()) {
         std::shared_ptr<const Location> location = getLocation();
         if (locationManager.isImported(*location)) {
-            std::string containingObject =
-                locationManager.getContainingObject(*location);
-            return containingObject + "." + handleReservedWords(name);
+            return locationManager.getImportedType(*location, name);
         }
     }
     return handleReservedWords(name);

tests/samples/ReuseBindings.json

@@ -1,10 +1,8 @@
 {
   "samples": {
     "package": "org.scalanative.bindgen.samples",
-    "headers": [
-      {
-        "header": "Struct.h"
-      }
+    "objects": [
+      "Struct.h"
     ]
   }
 }

tests/samples/ReuseStdio.h

@@ -0,0 +1,3 @@
+#include <stdio.h>
+
+extern FILE myFile;

tests/samples/ReuseStdio.json

@@ -0,0 +1,15 @@
+{
+  "libc": {
+    "package": "scala.scalanative.native",
+    "objects": [
+      {
+        "headers": [
+          "_stdio.h",
+          "FILE.h"
+        ],
+        "name": "stdio"
+      }
+    ]
+  }
+}
+

tests/samples/ReuseStdio.scala

@@ -0,0 +1,10 @@
+package org.scalanative.bindgen.samples
+
+import scala.scalanative._
+import scala.scalanative.native._
+
+@native.link("bindgentests")
+@native.extern
+object ReuseStdio {
+  val myFile: scala.scalanative.native.stdio.FILE = native.extern
+}