mirror of
https://github.com/nlohmann/json.git
synced 2026-09-30 19:50:34 +00:00
Niels LohmannandMuhammad Amir bin Mohamad Ghazaly
d914e3a027
Maps with enum keys, such as std::map<E, T>, are stored as arrays of [key, value] pairs, because enums are not convertible to the string type of object keys - even if NLOHMANN_JSON_SERIALIZE_ENUM maps them to strings (#4378). The new JSON_USE_OBJECTS_FOR_ENUM_KEYED_MAPS macro stores them as objects instead, converting each key with the enum's to_json. It applies to any map-like type with enum keys (std::map with any comparator, std::unordered_map, ...). A key that does not convert to a string throws type_error.302, and two keys converting to the same string throw the new type_error.318, rather than losing an entry. The macro changes the output of inline functions, so it is part of the ABI tag (_ekmo). Reading needs no macro: std::map and std::unordered_map with enum keys are now also read from objects, converting each key with the enum's from_json. That input was rejected before, and arrays of pairs are still read, so data written either way can be read. This supersedes #4531, which first proposed storing these maps as objects. Co-authored-by: Muhammad Amir bin Mohamad Ghazaly <amirghaz@umich.edu> Signed-off-by: Niels Lohmann <mail@nlohmann.me>
61 lines
1.4 KiB
C++
61 lines
1.4 KiB
C++
// __ _____ _____ _____
|
|
// __| | __| | | | JSON for Modern C++ (supporting code)
|
|
// | | |__ | | | | | | version 3.12.0
|
|
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
|
|
//
|
|
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
#include "doctest_compatibility.h"
|
|
|
|
#include "config.hpp"
|
|
|
|
#define NLOHMANN_JSON_NAMESPACE_NO_VERSION 1
|
|
#include <nlohmann/json_fwd.hpp>
|
|
|
|
TEST_CASE("default namespace without version component")
|
|
{
|
|
// GCC 4.8 fails with regex_error
|
|
#if !DOCTEST_GCC || DOCTEST_GCC >= DOCTEST_COMPILER(4, 9, 0)
|
|
SECTION("namespace matches expectation")
|
|
{
|
|
std::string expected = "nlohmann::json_abi";
|
|
|
|
#if JSON_DIAGNOSTICS
|
|
expected += "_diag";
|
|
#endif
|
|
|
|
#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
|
|
expected += "_ldvcmp";
|
|
#endif
|
|
|
|
#if JSON_DIAGNOSTIC_POSITIONS
|
|
expected += "_dp";
|
|
#endif
|
|
|
|
#if JSON_BRACE_INIT_COPY_SEMANTICS
|
|
expected += "_bics";
|
|
#endif
|
|
|
|
#if JSON_PRECISE_STREAM_POSITION
|
|
expected += "_psp";
|
|
#endif
|
|
|
|
#if JSON_STRICT_NUL_HANDLING
|
|
expected += "_snul";
|
|
#endif
|
|
|
|
#if JSON_USE_OBJECTS_FOR_ENUM_KEYED_MAPS
|
|
expected += "_ekmo";
|
|
#endif
|
|
|
|
expected += "::basic_json";
|
|
|
|
// fallback for Clang
|
|
const std::string ns{STRINGIZE(NLOHMANN_JSON_NAMESPACE) "::basic_json"};
|
|
|
|
CHECK(namespace_name<nlohmann::json>(ns) == expected);
|
|
}
|
|
#endif
|
|
}
|