-
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2258 from nlohmann/issue2179
Add ordered_json specialization with ordered object keys
- Loading branch information
Showing
7 changed files
with
256 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
#pragma once | ||
|
||
#include <functional> // less | ||
#include <memory> // allocator | ||
#include <utility> // pair | ||
#include <vector> // vector | ||
|
||
namespace nlohmann | ||
{ | ||
|
||
/// ordered_map: a minimal map-like container that preserves insertion order | ||
/// for use within nlohmann::basic_json<ordered_map> | ||
template <class Key, class T, class IgnoredLess = std::less<Key>, | ||
class Allocator = std::allocator<std::pair<const Key, T>>> | ||
struct ordered_map : std::vector<std::pair<const Key, T>, Allocator> | ||
{ | ||
using key_type = Key; | ||
using mapped_type = T; | ||
using Container = std::vector<std::pair<const Key, T>, Allocator>; | ||
using typename Container::iterator; | ||
using typename Container::size_type; | ||
using typename Container::value_type; | ||
|
||
// Explicit constructors instead of `using Container::Container` | ||
// otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4) | ||
ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {} | ||
template <class It> | ||
ordered_map(It first, It last, const Allocator& alloc = Allocator()) | ||
: Container{first, last, alloc} {} | ||
ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() ) | ||
: Container{init, alloc} {} | ||
|
||
std::pair<iterator, bool> emplace(key_type&& key, T&& t) | ||
{ | ||
for (auto it = this->begin(); it != this->end(); ++it) | ||
{ | ||
if (it->first == key) | ||
{ | ||
return {it, false}; | ||
} | ||
} | ||
Container::emplace_back(key, t); | ||
return {--this->end(), true}; | ||
} | ||
|
||
T& operator[](Key&& key) | ||
{ | ||
return emplace(std::move(key), T{}).first->second; | ||
} | ||
|
||
size_type erase(const Key& key) | ||
{ | ||
for (auto it = this->begin(); it != this->end(); ++it) | ||
{ | ||
if (it->first == key) | ||
{ | ||
// Since we cannot move const Keys, re-construct them in place | ||
for (auto next = it; ++next != this->end(); ++it) | ||
{ | ||
it->~value_type(); // Destroy but keep allocation | ||
new (&*it) value_type{std::move(*next)}; | ||
} | ||
Container::pop_back(); | ||
return 1; | ||
} | ||
} | ||
return 0; | ||
} | ||
}; | ||
|
||
} // namespace nlohmann |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
/* | ||
__ _____ _____ _____ | ||
__| | __| | | | JSON for Modern C++ (test suite) | ||
| | |__ | | | | | | version 3.8.0 | ||
|_____|_____|_____|_|___| https://github.com/nlohmann/json | ||
Licensed under the MIT License <http://opensource.org/licenses/MIT>. | ||
SPDX-License-Identifier: MIT | ||
Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>. | ||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
The above copyright notice and this permission notice shall be included in all | ||
copies or substantial portions of the Software. | ||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
SOFTWARE. | ||
*/ | ||
|
||
#include "doctest_compatibility.h" | ||
|
||
#include <nlohmann/json.hpp> | ||
using nlohmann::json; | ||
using nlohmann::ordered_json; | ||
|
||
|
||
TEST_CASE("ordered_json") | ||
{ | ||
json j; | ||
ordered_json oj; | ||
|
||
j["element3"] = 3; | ||
j["element1"] = 1; | ||
j["element2"] = 2; | ||
|
||
oj["element3"] = 3; | ||
oj["element1"] = 1; | ||
oj["element2"] = 2; | ||
|
||
CHECK(j.dump() == "{\"element1\":1,\"element2\":2,\"element3\":3}"); | ||
CHECK(oj.dump() == "{\"element3\":3,\"element1\":1,\"element2\":2}"); | ||
|
||
CHECK(j == json(oj)); | ||
CHECK(ordered_json(json(oj)) == ordered_json(j)); | ||
|
||
j.erase("element1"); | ||
oj.erase("element1"); | ||
|
||
CHECK(j.dump() == "{\"element2\":2,\"element3\":3}"); | ||
CHECK(oj.dump() == "{\"element3\":3,\"element2\":2}"); | ||
|
||
// remove again and nothing changes | ||
j.erase("element1"); | ||
oj.erase("element1"); | ||
|
||
CHECK(j.dump() == "{\"element2\":2,\"element3\":3}"); | ||
CHECK(oj.dump() == "{\"element3\":3,\"element2\":2}"); | ||
|
||
// There are no dup keys cause constructor calls emplace... | ||
json multi {{"z", 1}, {"m", 2}, {"m", 3}, {"y", 4}, {"m", 5}}; | ||
CHECK(multi.size() == 3); | ||
CHECK(multi.dump() == "{\"m\":2,\"y\":4,\"z\":1}"); | ||
|
||
ordered_json multi_ordered {{"z", 1}, {"m", 2}, {"m", 3}, {"y", 4}, {"m", 5}}; | ||
CHECK(multi_ordered.size() == 3); | ||
CHECK(multi_ordered.dump() == "{\"z\":1,\"m\":2,\"y\":4}"); | ||
CHECK(multi_ordered.erase("m") == 1); | ||
CHECK(multi_ordered.dump() == "{\"z\":1,\"y\":4}"); | ||
} |