Use json format for config file

Author: kornilova203

Dockerfile

@@ -13,6 +13,7 @@ RUN set -x \
             g++ openjdk-8-jdk-headless sbt cmake make curl git \
             zlib1g-dev \
             libgc-dev libunwind8-dev libre2-dev \
+            nlohmann-json-dev \
  && rm -rf /var/lib/apt/lists/*
 
 ARG LLVM_VERSION=6.0

bindgen/ir/LocationManager.cpp

@@ -10,36 +10,90 @@ LocationManager::LocationManager(std::string mainHeaderPath)
 void LocationManager::loadConfig(const std::string &path) {
     std::string realPath = getRealPath(path.c_str());
 
+    std::stringstream s;
     std::ifstream input(realPath);
     for (std::string line; getline(input, line);) {
-        size_t f = line.find('=');
-        if (f != std::string::npos) {
-            std::string header = line.substr(0, f);
-            std::string import = line.substr(f + 1, std::string::npos);
-            existingBindings[header] = import;
-        }
+        s << line;
     }
+    config = json::parse(s.str());
+    assert(config.is_object());
 }
 
 bool LocationManager::inMainFile(const Location &location) const {
     return location.getPath() == mainHeaderPath;
 }
 
 bool LocationManager::isImported(const Location &location) const {
-    for (const auto &existingBinding : existingBindings) {
-        if (endsWith(location.getPath(), existingBinding.first)) {
-            return true;
+    for (auto it = config.begin(); it != config.end(); ++it) {
+        json libObject = it.value();
+        for (const auto &header : libObject["headers"]) {
+            if (equal(header, location)) {
+                return true;
+            }
         }
     }
     return false;
 }
 
+bool LocationManager::equal(json header, const Location &location) const {
+    std::string headerName = getHeaderName(header);
+    return endsWith(location.getPath(), headerName);
+}
+
 std::string
 LocationManager::getContainingObject(const Location &location) const {
-    for (const auto &existingBinding : existingBindings) {
-        if (endsWith(location.getPath(), existingBinding.first)) {
-            return existingBinding.second;
+    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);
+            }
         }
     }
-    assert(false && "Location is not in the list of imported bindings");
+    throw std::logic_error("Location: " + location.getPath() +
+                           " does not belong to any known library");
+}
+
+std::string LocationManager::getHeaderName(const json &header) const {
+    if (header.is_string()) {
+        return header.get<std::string>();
+    } else {
+        return header["header"].get<std::string>();
+    }
+}
+
+std::string LocationManager::getContainingObject(const json &libObject,
+                                                 const json &header) const {
+    std::string package;
+    std::string name;
+    if (libObject.find("package") != libObject.end()) {
+        package = libObject["package"].get<std::string>();
+    }
+    if (libObject.find("name") != libObject.end()) {
+        package = libObject["name"].get<std::string>();
+    }
+    if (header.is_object()) {
+        /* override default values */
+        if (header.find("package") != header.end()) {
+            package = header["package"].get<std::string>();
+        }
+        if (header.find("name") != header.end()) {
+            name = header["name"].get<std::string>();
+        }
+    }
+    if (name.empty()) {
+        /* extract object name from header name */
+        name = getHeaderName(header);
+        auto slashPos = name.find_last_of('/');
+        if (slashPos != std::string::npos) {
+            name = name.substr(slashPos + 1, name.length());
+        }
+        if (endsWith(name, ".h")) {
+            name = name.substr(0, name.length() - 2);
+        }
+    }
+    if (!package.empty()) {
+        return package + "." + name;
+    }
+    return name;
 }

bindgen/ir/LocationManager.h

@@ -2,9 +2,12 @@
 #define SCALA_NATIVE_BINDGEN_LOCATIONMANAGER_H
 
 #include "Location.h"
+#include <nlohmann/json.hpp>
 #include <string>
 #include <unordered_map>
 
+using json = nlohmann::json;
+
 class LocationManager {
   public:
     explicit LocationManager(std::string mainHeaderPath);
@@ -22,7 +25,14 @@ class LocationManager {
 
   private:
     std::string mainHeaderPath;
-    std::unordered_map<std::string, std::string> existingBindings;
+    json config;
+
+    bool equal(json header, const Location &location) const;
+
+    std::string getHeaderName(const json &header) const;
+
+    std::string getContainingObject(const json &libObject,
+                                    const json &header) const;
 };
 
 #endif // SCALA_NATIVE_BINDGEN_LOCATIONMANAGER_H

tests/samples/ReuseBindings.config

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

tests/samples/ReuseBindings.json

@@ -46,7 +46,7 @@ class BindgenSpec extends FunSpec {
         val testName = input.getName.replace(".h", "")
         val expected = new File(inputDirectory, testName + ".scala")
         val output   = new File(outputDir, testName + ".scala")
-        val config   = new File(inputDirectory, testName + ".config")
+        val config   = new File(inputDirectory, testName + ".json")
 
         bindgen(input,
                 testName,