Move to inline constexpr to avoid duplication of symbols

Author: lefticus

src/json2cpp.cpp

@@ -40,7 +40,7 @@ std::string compile(const nlohmann::json &value, std::size_t &obj_count, std::ve
         "value_pair_t{{{}, {{{}}}}},", json_string(itr.key()), compile(*itr, obj_count, lines)));
     }
 
-    lines.push_back(fmt::format("static constexpr std::array<value_pair_t, {}> object_data_{} = {{",
+    lines.push_back(fmt::format("inline constexpr std::array<value_pair_t, {}> object_data_{} = {{",
       pairs.size(),
       current_object_number));
 
@@ -58,7 +58,7 @@ std::string compile(const nlohmann::json &value, std::size_t &obj_count, std::ve
     });
 
 
-    lines.push_back(fmt::format("static constexpr std::array<json, {}> object_data_{} = {{{{",
+    lines.push_back(fmt::format("inline constexpr std::array<json, {}> object_data_{} = {{{{",
       entries.size(),
       current_object_number));
 
@@ -99,7 +99,7 @@ compile_results compile(const std::string_view document_name, const nlohmann::js
   results.hpp.emplace_back("#include <json2cpp/json2cpp.hpp>");
 
   results.hpp.push_back(fmt::format("namespace compiled_json::{} {{", document_name));
-  results.hpp.push_back(fmt::format("  const json2cpp::json &get_{}();", document_name));
+  results.hpp.push_back(fmt::format("  const json2cpp::json &get();", document_name));
   results.hpp.emplace_back("}");
 
   results.hpp.emplace_back("#endif");
@@ -112,16 +112,32 @@ compile_results compile(const std::string_view document_name, const nlohmann::js
 
   results.impl.emplace_back("#include <json2cpp/json2cpp.hpp>");
 
-  results.impl.push_back(fmt::format("namespace compiled_json::{} {{\nusing json = json2cpp::basic_json<char>;\nusing data_t=json2cpp::data_variant<char>;\nusing string_view=std::basic_string_view<char>;\nusing array_t=json2cpp::basic_array_t<char>;\nusing object_t=json2cpp::basic_object_t<char>;\nusing value_pair_t=json2cpp::basic_value_pair_t<char>;\n", document_name));
+  results.impl.push_back(
+      fmt::format(R"(
+namespace compiled_json::{}::impl {{
+
+using json = json2cpp::basic_json<char>;
+using data_t=json2cpp::data_variant<char>;
+using string_view=std::basic_string_view<char>;
+using array_t=json2cpp::basic_array_t<char>;
+using object_t=json2cpp::basic_object_t<char>;
+using value_pair_t=json2cpp::basic_value_pair_t<char>;
+
+)", document_name));
 
 
   const auto last_obj_name = compile(json, obj_count, results.impl);
 
-  results.impl.push_back(fmt::format("static constexpr auto document = json{{{{{}}}}};", last_obj_name));
+  results.impl.push_back(fmt::format(R"(
+inline constexpr auto document = json{{{{{}}}}};
+
+
+}}
+
+#endif
+
+)", last_obj_name));
 
-  results.impl.push_back(fmt::format("const json2cpp::json &get_{}() {{ return document; }}", document_name));
-  results.impl.emplace_back("}");
-  results.impl.emplace_back("#endif");
 
   spdlog::info("{} JSON objects processed.", obj_count);
 
@@ -162,6 +178,7 @@ void write_compilation([[maybe_unused]] std::string_view document_name,
 
   std::ofstream cpp(cpp_name);
   cpp << fmt::format("#include \"{}\"\n", impl_name.filename().string());
+  cpp << fmt::format("namespace compiled_json::{} {{\nconst json2cpp::json &get() {{ return compiled_json::{}::impl::document; }}\n}}\n", document_name, document_name);
 }
 
 void compile_to(const std::string_view document_name,

src/schema_validator.cpp

@@ -114,7 +114,7 @@ bool validate_internal(const std::filesystem::path &file_to_validate)
   spdlog::info("Creating SchemaParser object");
   SchemaParser parser;
   spdlog::info("Creating json2cppJsonAdapter object");
-  json2cppJsonAdapter mySchemaAdapter(compiled_json::energyplus_schema::get_energyplus_schema());
+  json2cppJsonAdapter mySchemaAdapter(compiled_json::energyplus_schema::get());
   spdlog::info("parser.populateSchema object");
   parser.populateSchema(mySchemaAdapter, mySchema);
 
@@ -195,7 +195,7 @@ int main(int argc, const char **argv)
 
     if (args.at("--walk").asBool()) { 
       if (args.at("--internal").asBool()) {
-        walk(compiled_json::energyplus_schema::get_energyplus_schema()); 
+        walk(compiled_json::energyplus_schema::get()); 
       } else {
         std::filesystem::path schema_file_name = args.at("<schema_file>").asString();
         spdlog::info("Creating nlohmann::json object");

test/constexpr_schema_tests.cpp

@@ -4,7 +4,7 @@
 
 TEST_CASE("Basic test of very large energyplus JSON schema")
 {
-  constexpr auto &document = compiled_json::schema::document;// NOLINT No, I'm not going to mark this `const`
+  constexpr auto &document = compiled_json::schema::impl::document;// NOLINT No, I'm not going to mark this `const`
 
   using namespace std::literals::string_view_literals;
 

test/constexpr_tests.cpp

@@ -4,14 +4,14 @@
 
 TEST_CASE("Can read object size")
 {
-  constexpr auto &document = compiled_json::test_json::document;// NOLINT No, I'm not going to mark this `const`
+  constexpr auto &document = compiled_json::test_json::impl::document;// NOLINT No, I'm not going to mark this `const`
 
   STATIC_REQUIRE(document.size() == 1);
 }
 
 constexpr auto count_elements()
 {
-  constexpr auto &document = compiled_json::test_json::document;// NOLINT No, I'm not going to mark this `const`
+  constexpr auto &document = compiled_json::test_json::impl::document;// NOLINT No, I'm not going to mark this `const`
 
   std::size_t elements = 0;
   for (const auto &json : document) {
@@ -23,11 +23,11 @@ constexpr auto count_elements()
   return elements;
 }
 
-TEST_CASE("Can iterate object") { STATIC_REQUIRE(count_elements() == compiled_json::test_json::document.size()); }
+TEST_CASE("Can iterate object") { STATIC_REQUIRE(count_elements() == compiled_json::test_json::impl::document.size()); }
 
 TEST_CASE("Can read iterator key")
 {
-  constexpr auto &document = compiled_json::test_json::document;// NOLINT No, I'm not going to mark this `const`
+  constexpr auto &document = compiled_json::test_json::impl::document;// NOLINT No, I'm not going to mark this `const`
 
   STATIC_REQUIRE(document.begin().key() == "glossary");
 }

test/tests.cpp

@@ -3,15 +3,15 @@
 
 TEST_CASE("Can read object size")
 {
-  const auto &document = compiled_json::test_json::get_test_json();
+  const auto &document = compiled_json::test_json::get();
 
   REQUIRE(document.size() == 1);
 }
 
 
 TEST_CASE("Can iterate object")
 {
-  const auto &document = compiled_json::test_json::get_test_json();
+  const auto &document = compiled_json::test_json::get();
 
   std::size_t elements = 0;
   for (const auto &json : document) {
@@ -24,6 +24,6 @@ TEST_CASE("Can iterate object")
 
 TEST_CASE("Can read iterator key")
 {
-  const auto &document = compiled_json::test_json::get_test_json();
+  const auto &document = compiled_json::test_json::get();
   REQUIRE(document.begin().key() == "glossary");
 }

test/valijson_tests.cpp

@@ -20,7 +20,7 @@ TEST_CASE("Can load a valijson schema")
   Schema mySchema;
   SchemaParser parser;
   json2cppJsonAdapter mySchemaAdapter(
-    compiled_json::allof_integers_and_numbers_schema::get_allof_integers_and_numbers_schema());
+    compiled_json::allof_integers_and_numbers_schema::get());
   CHECK_NOTHROW(parser.populateSchema(mySchemaAdapter, mySchema));
 }
 
@@ -37,11 +37,11 @@ TEST_CASE("Validation fails where expected")
   Schema mySchema;
   SchemaParser parser;
   json2cppJsonAdapter mySchemaAdapter(
-    compiled_json::allof_integers_and_numbers_schema::get_allof_integers_and_numbers_schema());
+    compiled_json::allof_integers_and_numbers_schema::get());
   CHECK_NOTHROW(parser.populateSchema(mySchemaAdapter, mySchema));
 
   Validator validator;
-  json2cppJsonAdapter myTargetAdapter(compiled_json::array_doubles_10_20_30_40::get_array_doubles_10_20_30_40());
+  json2cppJsonAdapter myTargetAdapter(compiled_json::array_doubles_10_20_30_40::get());
 
   REQUIRE_FALSE(validator.validate(mySchema, myTargetAdapter, nullptr));
 }
@@ -59,11 +59,11 @@ TEST_CASE("Can validate a document")
   Schema mySchema;
   SchemaParser parser;
   json2cppJsonAdapter mySchemaAdapter(
-    compiled_json::allof_integers_and_numbers_schema::get_allof_integers_and_numbers_schema());
+    compiled_json::allof_integers_and_numbers_schema::get());
   CHECK_NOTHROW(parser.populateSchema(mySchemaAdapter, mySchema));
 
   Validator validator;
-  json2cppJsonAdapter myTargetAdapter(compiled_json::array_integers_10_20_30_40::get_array_integers_10_20_30_40());
+  json2cppJsonAdapter myTargetAdapter(compiled_json::array_integers_10_20_30_40::get());
 
   REQUIRE(validator.validate(mySchema, myTargetAdapter, nullptr));
 }