Merge pull request #2512 from YarikTH/issue2490

Ranged insert test section is added in unit-ordered_json.cpp
nlohmann · Dec 11, 2020 · d9e2b19 · d9e2b19
2 parents d8d8cbf + 972c15f
commit d9e2b19
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 0 deletions.
diff --git a/include/nlohmann/ordered_map.hpp b/include/nlohmann/ordered_map.hpp
@@ -168,6 +168,19 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
  Container::push_back(value);
  return {--this->end(), true};
  }
+
+ template<typename InputIt>
+ using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
+ std::input_iterator_tag>::value>::type;
+
+ template<typename InputIt, typename = require_input_iter<InputIt>>
+ void insert(InputIt first, InputIt last)
+ {
+ for (auto it = first; it != last; ++it)
+ {
+ insert(*it);
+ }
+ }
 };
 
 } // namespace nlohmann
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -16634,6 +16634,19 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
  Container::push_back(value);
  return {--this->end(), true};
  }
+
+ template<typename InputIt>
+ using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
+ std::input_iterator_tag>::value>::type;
+
+ template<typename InputIt, typename = require_input_iter<InputIt>>
+ void insert(InputIt first, InputIt last)
+ {
+ for (auto it = first; it != last; ++it)
+ {
+ insert(*it);
+ }
+ }
 };
 
 } // namespace nlohmann

diff --git a/test/src/unit-ordered_json.cpp b/test/src/unit-ordered_json.cpp
@@ -76,4 +76,18 @@ TEST_CASE("ordered_json")
  CHECK(multi_ordered.dump() == "{\"z\":1,\"m\":2,\"y\":4}");
  CHECK(multi_ordered.erase("m") == 1);
  CHECK(multi_ordered.dump() == "{\"z\":1,\"y\":4}");
+
+ // Ranged insert test.
+ // It seems that values shouldn't be overwritten. Only new values are added
+ json j1 {{"c", 1}, {"b", 2}, {"a", 3}};
+ const json j2 {{"c", 77}, {"d", 42}, {"a", 4}};
+ j1.insert( j2.cbegin(), j2.cend() );
+ CHECK(j1.size() == 4);
+ CHECK(j1.dump() == "{\"a\":3,\"b\":2,\"c\":1,\"d\":42}");
+
+ ordered_json oj1 {{"c", 1}, {"b", 2}, {"a", 3}};
+ const ordered_json oj2 {{"c", 77}, {"d", 42}, {"a", 4}};
+ oj1.insert( oj2.cbegin(), oj2.cend() );
+ CHECK(oj1.size() == 4);
+ CHECK(oj1.dump() == "{\"c\":1,\"b\":2,\"a\":3,\"d\":42}");
 }