mirror of
https://github.com/nlohmann/json.git
synced 2026-09-06 16:27:59 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Niels Lohmann
|
d0e5a087e9 | ||
|
Niels Lohmann
|
06a4ce1306 |
@@ -241,7 +241,7 @@ update_hedley:
|
||||
rm -f include/nlohmann/thirdparty/hedley/hedley.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp
|
||||
curl https://raw.githubusercontent.com/nemequ/hedley/master/hedley.h -o include/nlohmann/thirdparty/hedley/hedley.hpp
|
||||
$(SED) -i 's/HEDLEY_/JSON_HEDLEY_/g' include/nlohmann/thirdparty/hedley/hedley.hpp
|
||||
grep "[[:blank:]]*#[[:blank:]]*undef" include/nlohmann/thirdparty/hedley/hedley.hpp | grep -v "__" | sort | uniq | $(SED) 's/ //g' | $(SED) 's/undef/undef /g' > include/nlohmann/thirdparty/hedley/hedley_undef.hpp
|
||||
grep -oE "#[[:blank:]]*define[[:blank:]]+JSON_HEDLEY_[A-Za-z0-9_]+" include/nlohmann/thirdparty/hedley/hedley.hpp | awk '{print $$NF}' | grep -v "__" | sort -u | $(SED) 's/^/#undef /' > include/nlohmann/thirdparty/hedley/hedley_undef.hpp
|
||||
$(SED) -i '1s/^/#pragma once\n\n/' include/nlohmann/thirdparty/hedley/hedley.hpp
|
||||
$(SED) -i '1s/^/#pragma once\n\n/' include/nlohmann/thirdparty/hedley/hedley_undef.hpp
|
||||
$(MAKE) amalgamate
|
||||
|
||||
@@ -88,8 +88,6 @@ Strong exception safety: if an exception occurs, the original value stays intact
|
||||
do not belong to the same JSON value; example: `"iterators do not fit"`
|
||||
- Throws [`invalid_iterator.211`](../../home/exceptions.md#jsonexceptioninvalid_iterator211) if `first` or `last`
|
||||
are iterators into container for which insert is called; example: `"passed iterators may not belong to container"`
|
||||
- Throws [`invalid_iterator.202`](../../home/exceptions.md#jsonexceptioninvalid_iterator202) if `first` or `last`
|
||||
do not point to an array; example: `"iterators first and last must point to arrays"`
|
||||
4. The function can throw the following exceptions:
|
||||
- Throws [`type_error.309`](../../home/exceptions.md#jsonexceptiontype_error309) if called on JSON values other than
|
||||
arrays; example: `"cannot use insert() with string"`
|
||||
|
||||
@@ -1074,9 +1074,9 @@ char* to_chars(char* first, const char* last, FloatType value)
|
||||
*first++ = '-';
|
||||
}
|
||||
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
|
||||
#endif
|
||||
if (value == 0) // +-0
|
||||
{
|
||||
@@ -1086,9 +1086,7 @@ char* to_chars(char* first, const char* last, FloatType value)
|
||||
*first++ = '0';
|
||||
return first;
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
|
||||
JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
|
||||
|
||||
|
||||
@@ -32,9 +32,9 @@
|
||||
// functions to. As a result, we suppress this warning here to avoid client
|
||||
// code stumbling over this. See https://github.com/nlohmann/json/issues/4087
|
||||
// for a discussion.
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wweak-vtables"
|
||||
JSON_HEDLEY_PRAGMA(clang diagnostic ignored "-Wweak-vtables")
|
||||
#endif
|
||||
|
||||
NLOHMANN_JSON_NAMESPACE_BEGIN
|
||||
@@ -286,6 +286,4 @@ class other_error : public exception
|
||||
} // namespace detail
|
||||
NLOHMANN_JSON_NAMESPACE_END
|
||||
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
|
||||
@@ -8,11 +8,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <algorithm> // find_if
|
||||
#include <cstddef>
|
||||
#include <string> // string
|
||||
#include <type_traits> // enable_if_t
|
||||
#include <utility> // move, pair
|
||||
#include <utility> // move
|
||||
#include <vector> // vector
|
||||
|
||||
#include <nlohmann/detail/exceptions.hpp>
|
||||
@@ -250,7 +249,7 @@ class json_sax_dom_parser
|
||||
|
||||
if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
|
||||
{
|
||||
return parse_error(0, "", out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
|
||||
JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -299,7 +298,7 @@ class json_sax_dom_parser
|
||||
|
||||
if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
|
||||
{
|
||||
return parse_error(0, "", out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
|
||||
JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -569,7 +568,7 @@ class json_sax_dom_callback_parser
|
||||
// check object limit
|
||||
if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
|
||||
{
|
||||
return parse_error(0, "", out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
|
||||
JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
@@ -586,17 +585,7 @@ class json_sax_dom_callback_parser
|
||||
// add discarded value at the given key and store the reference for later
|
||||
if (keep && ref_stack.back())
|
||||
{
|
||||
auto& obj = *ref_stack.back()->m_data.m_value.object;
|
||||
const auto it = obj.find(val);
|
||||
if (it != obj.end())
|
||||
{
|
||||
// this is a duplicate key (legal in JSON); remember its
|
||||
// current value so it can be restored later if the new
|
||||
// value is rejected by the callback, instead of being
|
||||
// erased together with the discarded placeholder
|
||||
duplicate_key_stash.emplace_back(&(it->second), it->second);
|
||||
}
|
||||
object_element = &(obj[val] = discarded);
|
||||
object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val) = discarded);
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -608,18 +597,13 @@ class json_sax_dom_callback_parser
|
||||
{
|
||||
if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
|
||||
{
|
||||
// discard object, unless this slot holds a duplicate key's
|
||||
// previous value pending restoration, in which case that
|
||||
// value is restored instead of being discarded
|
||||
if (!resolve_duplicate_key_stash(ref_stack.back(), true))
|
||||
{
|
||||
*ref_stack.back() = discarded;
|
||||
// discard object
|
||||
*ref_stack.back() = discarded;
|
||||
|
||||
#if JSON_DIAGNOSTIC_POSITIONS
|
||||
// Set start/end positions for discarded object.
|
||||
handle_diagnostic_positions_for_json_value(*ref_stack.back());
|
||||
// Set start/end positions for discarded object.
|
||||
handle_diagnostic_positions_for_json_value(*ref_stack.back());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -633,10 +617,6 @@ class json_sax_dom_callback_parser
|
||||
#endif
|
||||
|
||||
ref_stack.back()->set_parents();
|
||||
// this object is finally, definitively kept; drop any
|
||||
// pending duplicate-key stash entry for its slot since it
|
||||
// can no longer be restored
|
||||
resolve_duplicate_key_stash(ref_stack.back(), false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -679,7 +659,7 @@ class json_sax_dom_callback_parser
|
||||
// check array limit
|
||||
if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
|
||||
{
|
||||
return parse_error(0, "", out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
|
||||
JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -706,25 +686,16 @@ class json_sax_dom_callback_parser
|
||||
#endif
|
||||
|
||||
ref_stack.back()->set_parents();
|
||||
// this array is finally, definitively kept; drop any
|
||||
// pending duplicate-key stash entry for its slot since it
|
||||
// can no longer be restored
|
||||
resolve_duplicate_key_stash(ref_stack.back(), false);
|
||||
}
|
||||
else
|
||||
{
|
||||
// discard array, unless this slot holds a duplicate key's
|
||||
// previous value pending restoration, in which case that
|
||||
// value is restored instead of being discarded
|
||||
if (!resolve_duplicate_key_stash(ref_stack.back(), true))
|
||||
{
|
||||
*ref_stack.back() = discarded;
|
||||
// discard array
|
||||
*ref_stack.back() = discarded;
|
||||
|
||||
#if JSON_DIAGNOSTIC_POSITIONS
|
||||
// Set start/end positions for discarded array.
|
||||
handle_diagnostic_positions_for_json_value(*ref_stack.back());
|
||||
// Set start/end positions for discarded array.
|
||||
handle_diagnostic_positions_for_json_value(*ref_stack.back());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -838,48 +809,14 @@ class json_sax_dom_callback_parser
|
||||
}
|
||||
#endif
|
||||
|
||||
/// if there is a pending duplicate-key stash entry for this exact slot,
|
||||
/// remove it from the stash; if restore_value is true, the stashed
|
||||
/// previous value is moved back into the slot first (use this when the
|
||||
/// new value at that slot was rejected); otherwise the stash entry is
|
||||
/// simply dropped (use this when the new value was accepted, so it
|
||||
/// correctly supersedes the old one and no restore should ever happen
|
||||
/// for this slot again)
|
||||
/// @return whether a matching stash entry was found (and processed)
|
||||
bool resolve_duplicate_key_stash(BasicJsonType* slot, bool restore_value)
|
||||
{
|
||||
const auto it = std::find_if(duplicate_key_stash.begin(), duplicate_key_stash.end(),
|
||||
[slot](const std::pair<BasicJsonType*, BasicJsonType>& entry)
|
||||
{
|
||||
return entry.first == slot;
|
||||
});
|
||||
|
||||
if (it == duplicate_key_stash.end())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (restore_value)
|
||||
{
|
||||
*slot = std::move(it->second);
|
||||
}
|
||||
duplicate_key_stash.erase(it);
|
||||
return true;
|
||||
}
|
||||
|
||||
/// remove the discarded value the callback rejected from its parent,
|
||||
/// unless it is a duplicate key's slot with a stashed previous value,
|
||||
/// in which case that previous value is restored instead
|
||||
void remove_discarded_value(BasicJsonType& parent)
|
||||
/// remove the discarded value the callback rejected from its parent
|
||||
static void remove_discarded_value(BasicJsonType& parent)
|
||||
{
|
||||
for (auto it = parent.begin(); it != parent.end(); ++it)
|
||||
{
|
||||
if (it->is_discarded())
|
||||
{
|
||||
if (!resolve_duplicate_key_stash(&(*it), true))
|
||||
{
|
||||
parent.erase(it);
|
||||
}
|
||||
parent.erase(it);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -977,16 +914,6 @@ class json_sax_dom_callback_parser
|
||||
|
||||
JSON_ASSERT(object_element);
|
||||
*object_element = std::move(value);
|
||||
if (!skip_callback)
|
||||
{
|
||||
// this scalar value finally, definitively replaces whatever was
|
||||
// at this slot; drop any pending duplicate-key stash entry for
|
||||
// it since it can no longer be restored (a container value at
|
||||
// this slot is resolved later, in end_object()/end_array(),
|
||||
// since skip_callback is true for the placeholder handling that
|
||||
// happens here for those)
|
||||
resolve_duplicate_key_stash(object_element, false);
|
||||
}
|
||||
return {true, object_element};
|
||||
}
|
||||
|
||||
@@ -1000,12 +927,6 @@ class json_sax_dom_callback_parser
|
||||
std::vector<bool> key_keep_stack {}; // NOLINT(readability-redundant-member-init)
|
||||
/// helper to hold the reference for the next object element
|
||||
BasicJsonType* object_element = nullptr;
|
||||
/// stash of (slot pointer, previous value) for object members that
|
||||
/// already existed when key() was called again for the same key
|
||||
/// (duplicate keys); used to restore the previous value if the new
|
||||
/// value is later rejected by the callback, instead of erasing the
|
||||
/// member entirely
|
||||
std::vector<std::pair<BasicJsonType*, BasicJsonType>> duplicate_key_stash {};
|
||||
/// whether a syntax error occurred
|
||||
bool errored = false;
|
||||
/// callback function
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#endif
|
||||
|
||||
#include <nlohmann/detail/abi_macros.hpp>
|
||||
#include <nlohmann/detail/macro_scope.hpp>
|
||||
#include <nlohmann/detail/meta/type_traits.hpp>
|
||||
#include <nlohmann/detail/string_utils.hpp>
|
||||
#include <nlohmann/detail/value_t.hpp>
|
||||
@@ -206,10 +207,10 @@ NLOHMANN_JSON_NAMESPACE_END
|
||||
namespace std
|
||||
{
|
||||
|
||||
// Fix: https://github.com/nlohmann/json/issues/1401
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#if defined(__clang__)
|
||||
// Fix: https://github.com/nlohmann/json/issues/1401
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wmismatched-tags"
|
||||
JSON_HEDLEY_PRAGMA(clang diagnostic ignored "-Wmismatched-tags")
|
||||
#endif
|
||||
template<typename IteratorType>
|
||||
class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
|
||||
@@ -223,9 +224,7 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
|
||||
get<N>(std::declval <
|
||||
::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
|
||||
};
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
|
||||
} // namespace std
|
||||
|
||||
|
||||
@@ -1849,9 +1849,9 @@ class binary_writer
|
||||
|
||||
void write_compact_float(const number_float_t n, detail::input_format_t format)
|
||||
{
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
|
||||
#endif
|
||||
if (!std::isfinite(n) || ((static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
|
||||
static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
|
||||
@@ -1869,9 +1869,7 @@ class binary_writer
|
||||
: get_msgpack_float_prefix(n));
|
||||
write_number(n);
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
}
|
||||
|
||||
public:
|
||||
|
||||
+20
-137
@@ -3425,12 +3425,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
|
||||
}
|
||||
|
||||
// passed iterators must belong to arrays
|
||||
if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_array()))
|
||||
{
|
||||
JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to arrays", this));
|
||||
}
|
||||
|
||||
// insert to array and return iterator
|
||||
return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
|
||||
}
|
||||
@@ -3579,7 +3573,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
{
|
||||
using std::swap;
|
||||
swap(*(m_data.m_value.array), other);
|
||||
set_parents();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3596,7 +3589,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
{
|
||||
using std::swap;
|
||||
swap(*(m_data.m_value.object), other);
|
||||
set_parents();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -3777,15 +3769,13 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
||||
bool operator==(const_reference rhs) const noexcept
|
||||
{
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
|
||||
#endif
|
||||
const_reference lhs = *this;
|
||||
JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
}
|
||||
|
||||
/// @brief comparison: equal
|
||||
@@ -3870,14 +3860,12 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
||||
friend bool operator==(const_reference lhs, const_reference rhs) noexcept
|
||||
{
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
|
||||
#endif
|
||||
JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
}
|
||||
|
||||
/// @brief comparison: equal
|
||||
@@ -5165,139 +5153,34 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
|
||||
case value_t::object:
|
||||
{
|
||||
// first pass: record, for every source key, whether it is
|
||||
// common to both objects (in source's iteration order) or
|
||||
// was deleted (i.e., in source but not in target) -- this is
|
||||
// a by-product of the target.find() call already needed to
|
||||
// tell the two cases apart, so it adds no extra lookups. The
|
||||
// "remove" ops themselves are emitted later, interleaved
|
||||
// with the recursive per-key diffs in the fast path below,
|
||||
// to match source's original iteration order (as the
|
||||
// original, pre-reordering-aware implementation did) instead
|
||||
// of grouping all removes before all recursive diffs.
|
||||
std::vector<typename object_t::key_type> common_keys_source_order;
|
||||
// first pass: traverse this object's elements
|
||||
for (auto it = source.cbegin(); it != source.cend(); ++it)
|
||||
{
|
||||
// escape the key name to be used in a JSON patch
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
|
||||
if (target.find(it.key()) != target.end())
|
||||
{
|
||||
common_keys_source_order.push_back(it.key());
|
||||
}
|
||||
}
|
||||
|
||||
// second pass: find keys that were added (i.e., in target but
|
||||
// not in source), and record the keys common to both, in
|
||||
// target's iteration order -- again a by-product of the
|
||||
// source.find() call already needed to detect added keys. At
|
||||
// the same time, determine whether every added key comes
|
||||
// after every common key in target's order (a precondition
|
||||
// for the fast path below, which only ever appends new keys
|
||||
// at the very end): for an object_t whose iteration order is
|
||||
// a pure function of the key set (e.g. the default std::map,
|
||||
// which always iterates in sorted key order), the order
|
||||
// check further below is always true and this whole
|
||||
// mechanism is effectively a no-op; it only matters for a
|
||||
// reorderable object_t such as the one backing `ordered_json`.
|
||||
// patch ops for keys that were added (i.e., in target but not
|
||||
// in source); built here so the fast path below can reuse
|
||||
// them without a second source.find() per target key. Only
|
||||
// used by the fast path -- the slow (reordering) path
|
||||
// rebuilds "add" ops for every key itself.
|
||||
std::vector<typename object_t::key_type> common_keys_target_order;
|
||||
basic_json added_ops(value_t::array);
|
||||
bool new_keys_form_suffix = true;
|
||||
bool seen_new_key = false;
|
||||
for (auto it = target.cbegin(); it != target.cend(); ++it)
|
||||
{
|
||||
if (source.find(it.key()) == source.end())
|
||||
{
|
||||
seen_new_key = true;
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
added_ops.push_back(
|
||||
{
|
||||
{"op", "add"}, {"path", path_key},
|
||||
{"value", it.value()}
|
||||
});
|
||||
// recursive call to compare object values at key it
|
||||
auto temp_diff = diff(it.value(), target[it.key()], path_key);
|
||||
result.insert(result.end(), temp_diff.begin(), temp_diff.end());
|
||||
}
|
||||
else
|
||||
{
|
||||
common_keys_target_order.push_back(it.key());
|
||||
if (seen_new_key)
|
||||
{
|
||||
new_keys_form_suffix = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (common_keys_source_order == common_keys_target_order && new_keys_form_suffix)
|
||||
{
|
||||
// fast path: order of common keys already matches (or the
|
||||
// object_t's iteration order does not depend on
|
||||
// insertion history), so a plain per-key recursive diff
|
||||
// is correct and minimal, as before. common_keys_source_order
|
||||
// is, by construction, the subsequence of source's keys
|
||||
// that are common to both objects, in source's iteration
|
||||
// order -- so it can be walked in lockstep with `source`
|
||||
// using a cheap key comparison instead of another lookup.
|
||||
// Deleted keys (those source keys not in common_keys_source_order)
|
||||
// are interleaved here too, in source's original order, to
|
||||
// match the historical (pre-reordering-aware) output order.
|
||||
auto common_it = common_keys_source_order.cbegin();
|
||||
for (auto it = source.cbegin(); it != source.cend(); ++it)
|
||||
{
|
||||
if (common_it != common_keys_source_order.cend() && it.key() == *common_it)
|
||||
{
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
auto temp_diff = diff(it.value(), target[it.key()], path_key);
|
||||
result.insert(result.end(), temp_diff.begin(), temp_diff.end());
|
||||
++common_it;
|
||||
}
|
||||
else
|
||||
{
|
||||
// found a key that is not in target -> remove it
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
result.push_back(object(
|
||||
{
|
||||
{"op", "remove"}, {"path", path_key}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
// append the "add" ops for brand-new keys collected above
|
||||
// during the pass over target -- no second source.find()
|
||||
// per target key needed
|
||||
result.insert(result.end(), added_ops.begin(), added_ops.end());
|
||||
}
|
||||
else
|
||||
{
|
||||
// slow path: the common keys are in a different relative
|
||||
// order in source and target (only possible for a
|
||||
// reorderable object_t like ordered_map). Building a
|
||||
// minimal reordering patch is a nontrivial (LCS-like)
|
||||
// problem; instead, remove every source key -- both
|
||||
// deleted keys (which must be removed regardless) and
|
||||
// common keys (removed so they can be re-added in
|
||||
// target's order) -- and re-add every key that should
|
||||
// remain, with its final target value, in target's
|
||||
// order. basic_json::patch()'s "add" operation on an
|
||||
// object uses operator[], which appends at the end for a
|
||||
// vector-backed insertion-ordered map when the key does
|
||||
// not already exist -- so removing a key and then adding
|
||||
// it moves it to the end, fixing its position.
|
||||
for (auto it = source.cbegin(); it != source.cend(); ++it)
|
||||
{
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
// found a key that is not in o -> remove it
|
||||
result.push_back(object(
|
||||
{
|
||||
{"op", "remove"}, {"path", path_key}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
// add every key that is either common (just removed
|
||||
// above) or brand new, in target's iteration order, so
|
||||
// that the final order after applying the patch matches
|
||||
// target exactly
|
||||
for (auto it = target.cbegin(); it != target.cend(); ++it)
|
||||
// second pass: traverse other object's elements
|
||||
for (auto it = target.cbegin(); it != target.cend(); ++it)
|
||||
{
|
||||
if (source.find(it.key()) == source.end())
|
||||
{
|
||||
// found a key that is not in this -> add it
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
result.push_back(
|
||||
{
|
||||
|
||||
+4
-1
@@ -17,7 +17,7 @@
|
||||
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
|
||||
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
|
||||
#undef JSON_HEDLEY_CLANG_HAS_FEATURE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_WARNING
|
||||
@@ -108,7 +108,10 @@
|
||||
#undef JSON_HEDLEY_PELLES_VERSION_CHECK
|
||||
#undef JSON_HEDLEY_PGI_VERSION
|
||||
#undef JSON_HEDLEY_PGI_VERSION_CHECK
|
||||
#undef JSON_HEDLEY_PRAGMA
|
||||
#undef JSON_HEDLEY_PREDICT
|
||||
#undef JSON_HEDLEY_PREDICT_FALSE
|
||||
#undef JSON_HEDLEY_PREDICT_TRUE
|
||||
#undef JSON_HEDLEY_PRINTF_FORMAT
|
||||
#undef JSON_HEDLEY_PRIVATE
|
||||
#undef JSON_HEDLEY_PUBLIC
|
||||
|
||||
@@ -4944,9 +4944,9 @@ NLOHMANN_JSON_NAMESPACE_END
|
||||
// functions to. As a result, we suppress this warning here to avoid client
|
||||
// code stumbling over this. See https://github.com/nlohmann/json/issues/4087
|
||||
// for a discussion.
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wweak-vtables"
|
||||
JSON_HEDLEY_PRAGMA(clang diagnostic ignored "-Wweak-vtables")
|
||||
#endif
|
||||
|
||||
NLOHMANN_JSON_NAMESPACE_BEGIN
|
||||
@@ -5198,9 +5198,7 @@ class other_error : public exception
|
||||
} // namespace detail
|
||||
NLOHMANN_JSON_NAMESPACE_END
|
||||
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
|
||||
// #include <nlohmann/detail/macro_scope.hpp>
|
||||
|
||||
@@ -5975,6 +5973,8 @@ NLOHMANN_JSON_NAMESPACE_END
|
||||
|
||||
// #include <nlohmann/detail/abi_macros.hpp>
|
||||
|
||||
// #include <nlohmann/detail/macro_scope.hpp>
|
||||
|
||||
// #include <nlohmann/detail/meta/type_traits.hpp>
|
||||
|
||||
// #include <nlohmann/detail/string_utils.hpp>
|
||||
@@ -6204,10 +6204,10 @@ NLOHMANN_JSON_NAMESPACE_END
|
||||
namespace std
|
||||
{
|
||||
|
||||
// Fix: https://github.com/nlohmann/json/issues/1401
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#if defined(__clang__)
|
||||
// Fix: https://github.com/nlohmann/json/issues/1401
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wmismatched-tags"
|
||||
JSON_HEDLEY_PRAGMA(clang diagnostic ignored "-Wmismatched-tags")
|
||||
#endif
|
||||
template<typename IteratorType>
|
||||
class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
|
||||
@@ -6221,9 +6221,7 @@ class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
|
||||
get<N>(std::declval <
|
||||
::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
|
||||
};
|
||||
#if defined(__clang__)
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
|
||||
} // namespace std
|
||||
|
||||
@@ -7768,11 +7766,10 @@ NLOHMANN_JSON_NAMESPACE_END
|
||||
|
||||
|
||||
|
||||
#include <algorithm> // find_if
|
||||
#include <cstddef>
|
||||
#include <string> // string
|
||||
#include <type_traits> // enable_if_t
|
||||
#include <utility> // move, pair
|
||||
#include <utility> // move
|
||||
#include <vector> // vector
|
||||
|
||||
// #include <nlohmann/detail/exceptions.hpp>
|
||||
@@ -9778,7 +9775,7 @@ class json_sax_dom_parser
|
||||
|
||||
if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
|
||||
{
|
||||
return parse_error(0, "", out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
|
||||
JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -9827,7 +9824,7 @@ class json_sax_dom_parser
|
||||
|
||||
if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
|
||||
{
|
||||
return parse_error(0, "", out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
|
||||
JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -10097,7 +10094,7 @@ class json_sax_dom_callback_parser
|
||||
// check object limit
|
||||
if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
|
||||
{
|
||||
return parse_error(0, "", out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
|
||||
JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
|
||||
}
|
||||
}
|
||||
return true;
|
||||
@@ -10114,17 +10111,7 @@ class json_sax_dom_callback_parser
|
||||
// add discarded value at the given key and store the reference for later
|
||||
if (keep && ref_stack.back())
|
||||
{
|
||||
auto& obj = *ref_stack.back()->m_data.m_value.object;
|
||||
const auto it = obj.find(val);
|
||||
if (it != obj.end())
|
||||
{
|
||||
// this is a duplicate key (legal in JSON); remember its
|
||||
// current value so it can be restored later if the new
|
||||
// value is rejected by the callback, instead of being
|
||||
// erased together with the discarded placeholder
|
||||
duplicate_key_stash.emplace_back(&(it->second), it->second);
|
||||
}
|
||||
object_element = &(obj[val] = discarded);
|
||||
object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val) = discarded);
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -10136,18 +10123,13 @@ class json_sax_dom_callback_parser
|
||||
{
|
||||
if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
|
||||
{
|
||||
// discard object, unless this slot holds a duplicate key's
|
||||
// previous value pending restoration, in which case that
|
||||
// value is restored instead of being discarded
|
||||
if (!resolve_duplicate_key_stash(ref_stack.back(), true))
|
||||
{
|
||||
*ref_stack.back() = discarded;
|
||||
// discard object
|
||||
*ref_stack.back() = discarded;
|
||||
|
||||
#if JSON_DIAGNOSTIC_POSITIONS
|
||||
// Set start/end positions for discarded object.
|
||||
handle_diagnostic_positions_for_json_value(*ref_stack.back());
|
||||
// Set start/end positions for discarded object.
|
||||
handle_diagnostic_positions_for_json_value(*ref_stack.back());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -10161,10 +10143,6 @@ class json_sax_dom_callback_parser
|
||||
#endif
|
||||
|
||||
ref_stack.back()->set_parents();
|
||||
// this object is finally, definitively kept; drop any
|
||||
// pending duplicate-key stash entry for its slot since it
|
||||
// can no longer be restored
|
||||
resolve_duplicate_key_stash(ref_stack.back(), false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10207,7 +10185,7 @@ class json_sax_dom_callback_parser
|
||||
// check array limit
|
||||
if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
|
||||
{
|
||||
return parse_error(0, "", out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
|
||||
JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10234,25 +10212,16 @@ class json_sax_dom_callback_parser
|
||||
#endif
|
||||
|
||||
ref_stack.back()->set_parents();
|
||||
// this array is finally, definitively kept; drop any
|
||||
// pending duplicate-key stash entry for its slot since it
|
||||
// can no longer be restored
|
||||
resolve_duplicate_key_stash(ref_stack.back(), false);
|
||||
}
|
||||
else
|
||||
{
|
||||
// discard array, unless this slot holds a duplicate key's
|
||||
// previous value pending restoration, in which case that
|
||||
// value is restored instead of being discarded
|
||||
if (!resolve_duplicate_key_stash(ref_stack.back(), true))
|
||||
{
|
||||
*ref_stack.back() = discarded;
|
||||
// discard array
|
||||
*ref_stack.back() = discarded;
|
||||
|
||||
#if JSON_DIAGNOSTIC_POSITIONS
|
||||
// Set start/end positions for discarded array.
|
||||
handle_diagnostic_positions_for_json_value(*ref_stack.back());
|
||||
// Set start/end positions for discarded array.
|
||||
handle_diagnostic_positions_for_json_value(*ref_stack.back());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10366,48 +10335,14 @@ class json_sax_dom_callback_parser
|
||||
}
|
||||
#endif
|
||||
|
||||
/// if there is a pending duplicate-key stash entry for this exact slot,
|
||||
/// remove it from the stash; if restore_value is true, the stashed
|
||||
/// previous value is moved back into the slot first (use this when the
|
||||
/// new value at that slot was rejected); otherwise the stash entry is
|
||||
/// simply dropped (use this when the new value was accepted, so it
|
||||
/// correctly supersedes the old one and no restore should ever happen
|
||||
/// for this slot again)
|
||||
/// @return whether a matching stash entry was found (and processed)
|
||||
bool resolve_duplicate_key_stash(BasicJsonType* slot, bool restore_value)
|
||||
{
|
||||
const auto it = std::find_if(duplicate_key_stash.begin(), duplicate_key_stash.end(),
|
||||
[slot](const std::pair<BasicJsonType*, BasicJsonType>& entry)
|
||||
{
|
||||
return entry.first == slot;
|
||||
});
|
||||
|
||||
if (it == duplicate_key_stash.end())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (restore_value)
|
||||
{
|
||||
*slot = std::move(it->second);
|
||||
}
|
||||
duplicate_key_stash.erase(it);
|
||||
return true;
|
||||
}
|
||||
|
||||
/// remove the discarded value the callback rejected from its parent,
|
||||
/// unless it is a duplicate key's slot with a stashed previous value,
|
||||
/// in which case that previous value is restored instead
|
||||
void remove_discarded_value(BasicJsonType& parent)
|
||||
/// remove the discarded value the callback rejected from its parent
|
||||
static void remove_discarded_value(BasicJsonType& parent)
|
||||
{
|
||||
for (auto it = parent.begin(); it != parent.end(); ++it)
|
||||
{
|
||||
if (it->is_discarded())
|
||||
{
|
||||
if (!resolve_duplicate_key_stash(&(*it), true))
|
||||
{
|
||||
parent.erase(it);
|
||||
}
|
||||
parent.erase(it);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -10505,16 +10440,6 @@ class json_sax_dom_callback_parser
|
||||
|
||||
JSON_ASSERT(object_element);
|
||||
*object_element = std::move(value);
|
||||
if (!skip_callback)
|
||||
{
|
||||
// this scalar value finally, definitively replaces whatever was
|
||||
// at this slot; drop any pending duplicate-key stash entry for
|
||||
// it since it can no longer be restored (a container value at
|
||||
// this slot is resolved later, in end_object()/end_array(),
|
||||
// since skip_callback is true for the placeholder handling that
|
||||
// happens here for those)
|
||||
resolve_duplicate_key_stash(object_element, false);
|
||||
}
|
||||
return {true, object_element};
|
||||
}
|
||||
|
||||
@@ -10528,12 +10453,6 @@ class json_sax_dom_callback_parser
|
||||
std::vector<bool> key_keep_stack {}; // NOLINT(readability-redundant-member-init)
|
||||
/// helper to hold the reference for the next object element
|
||||
BasicJsonType* object_element = nullptr;
|
||||
/// stash of (slot pointer, previous value) for object members that
|
||||
/// already existed when key() was called again for the same key
|
||||
/// (duplicate keys); used to restore the previous value if the new
|
||||
/// value is later rejected by the callback, instead of erasing the
|
||||
/// member entirely
|
||||
std::vector<std::pair<BasicJsonType*, BasicJsonType>> duplicate_key_stash {};
|
||||
/// whether a syntax error occurred
|
||||
bool errored = false;
|
||||
/// callback function
|
||||
@@ -18936,9 +18855,9 @@ class binary_writer
|
||||
|
||||
void write_compact_float(const number_float_t n, detail::input_format_t format)
|
||||
{
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
|
||||
#endif
|
||||
if (!std::isfinite(n) || ((static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
|
||||
static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
|
||||
@@ -18956,9 +18875,7 @@ class binary_writer
|
||||
: get_msgpack_float_prefix(n));
|
||||
write_number(n);
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
}
|
||||
|
||||
public:
|
||||
@@ -20131,9 +20048,9 @@ char* to_chars(char* first, const char* last, FloatType value)
|
||||
*first++ = '-';
|
||||
}
|
||||
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
|
||||
#endif
|
||||
if (value == 0) // +-0
|
||||
{
|
||||
@@ -20143,9 +20060,7 @@ char* to_chars(char* first, const char* last, FloatType value)
|
||||
*first++ = '0';
|
||||
return first;
|
||||
}
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
|
||||
JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
|
||||
|
||||
@@ -24932,12 +24847,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
|
||||
}
|
||||
|
||||
// passed iterators must belong to arrays
|
||||
if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_array()))
|
||||
{
|
||||
JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to arrays", this));
|
||||
}
|
||||
|
||||
// insert to array and return iterator
|
||||
return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
|
||||
}
|
||||
@@ -25086,7 +24995,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
{
|
||||
using std::swap;
|
||||
swap(*(m_data.m_value.array), other);
|
||||
set_parents();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -25103,7 +25011,6 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
{
|
||||
using std::swap;
|
||||
swap(*(m_data.m_value.object), other);
|
||||
set_parents();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -25284,15 +25191,13 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
||||
bool operator==(const_reference rhs) const noexcept
|
||||
{
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
|
||||
#endif
|
||||
const_reference lhs = *this;
|
||||
JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
}
|
||||
|
||||
/// @brief comparison: equal
|
||||
@@ -25377,14 +25282,12 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
/// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
|
||||
friend bool operator==(const_reference lhs, const_reference rhs) noexcept
|
||||
{
|
||||
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||
JSON_HEDLEY_PRAGMA(GCC diagnostic ignored "-Wfloat-equal")
|
||||
#endif
|
||||
JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
}
|
||||
|
||||
/// @brief comparison: equal
|
||||
@@ -26672,139 +26575,34 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
||||
|
||||
case value_t::object:
|
||||
{
|
||||
// first pass: record, for every source key, whether it is
|
||||
// common to both objects (in source's iteration order) or
|
||||
// was deleted (i.e., in source but not in target) -- this is
|
||||
// a by-product of the target.find() call already needed to
|
||||
// tell the two cases apart, so it adds no extra lookups. The
|
||||
// "remove" ops themselves are emitted later, interleaved
|
||||
// with the recursive per-key diffs in the fast path below,
|
||||
// to match source's original iteration order (as the
|
||||
// original, pre-reordering-aware implementation did) instead
|
||||
// of grouping all removes before all recursive diffs.
|
||||
std::vector<typename object_t::key_type> common_keys_source_order;
|
||||
// first pass: traverse this object's elements
|
||||
for (auto it = source.cbegin(); it != source.cend(); ++it)
|
||||
{
|
||||
// escape the key name to be used in a JSON patch
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
|
||||
if (target.find(it.key()) != target.end())
|
||||
{
|
||||
common_keys_source_order.push_back(it.key());
|
||||
}
|
||||
}
|
||||
|
||||
// second pass: find keys that were added (i.e., in target but
|
||||
// not in source), and record the keys common to both, in
|
||||
// target's iteration order -- again a by-product of the
|
||||
// source.find() call already needed to detect added keys. At
|
||||
// the same time, determine whether every added key comes
|
||||
// after every common key in target's order (a precondition
|
||||
// for the fast path below, which only ever appends new keys
|
||||
// at the very end): for an object_t whose iteration order is
|
||||
// a pure function of the key set (e.g. the default std::map,
|
||||
// which always iterates in sorted key order), the order
|
||||
// check further below is always true and this whole
|
||||
// mechanism is effectively a no-op; it only matters for a
|
||||
// reorderable object_t such as the one backing `ordered_json`.
|
||||
// patch ops for keys that were added (i.e., in target but not
|
||||
// in source); built here so the fast path below can reuse
|
||||
// them without a second source.find() per target key. Only
|
||||
// used by the fast path -- the slow (reordering) path
|
||||
// rebuilds "add" ops for every key itself.
|
||||
std::vector<typename object_t::key_type> common_keys_target_order;
|
||||
basic_json added_ops(value_t::array);
|
||||
bool new_keys_form_suffix = true;
|
||||
bool seen_new_key = false;
|
||||
for (auto it = target.cbegin(); it != target.cend(); ++it)
|
||||
{
|
||||
if (source.find(it.key()) == source.end())
|
||||
{
|
||||
seen_new_key = true;
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
added_ops.push_back(
|
||||
{
|
||||
{"op", "add"}, {"path", path_key},
|
||||
{"value", it.value()}
|
||||
});
|
||||
// recursive call to compare object values at key it
|
||||
auto temp_diff = diff(it.value(), target[it.key()], path_key);
|
||||
result.insert(result.end(), temp_diff.begin(), temp_diff.end());
|
||||
}
|
||||
else
|
||||
{
|
||||
common_keys_target_order.push_back(it.key());
|
||||
if (seen_new_key)
|
||||
{
|
||||
new_keys_form_suffix = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (common_keys_source_order == common_keys_target_order && new_keys_form_suffix)
|
||||
{
|
||||
// fast path: order of common keys already matches (or the
|
||||
// object_t's iteration order does not depend on
|
||||
// insertion history), so a plain per-key recursive diff
|
||||
// is correct and minimal, as before. common_keys_source_order
|
||||
// is, by construction, the subsequence of source's keys
|
||||
// that are common to both objects, in source's iteration
|
||||
// order -- so it can be walked in lockstep with `source`
|
||||
// using a cheap key comparison instead of another lookup.
|
||||
// Deleted keys (those source keys not in common_keys_source_order)
|
||||
// are interleaved here too, in source's original order, to
|
||||
// match the historical (pre-reordering-aware) output order.
|
||||
auto common_it = common_keys_source_order.cbegin();
|
||||
for (auto it = source.cbegin(); it != source.cend(); ++it)
|
||||
{
|
||||
if (common_it != common_keys_source_order.cend() && it.key() == *common_it)
|
||||
{
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
auto temp_diff = diff(it.value(), target[it.key()], path_key);
|
||||
result.insert(result.end(), temp_diff.begin(), temp_diff.end());
|
||||
++common_it;
|
||||
}
|
||||
else
|
||||
{
|
||||
// found a key that is not in target -> remove it
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
result.push_back(object(
|
||||
{
|
||||
{"op", "remove"}, {"path", path_key}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
// append the "add" ops for brand-new keys collected above
|
||||
// during the pass over target -- no second source.find()
|
||||
// per target key needed
|
||||
result.insert(result.end(), added_ops.begin(), added_ops.end());
|
||||
}
|
||||
else
|
||||
{
|
||||
// slow path: the common keys are in a different relative
|
||||
// order in source and target (only possible for a
|
||||
// reorderable object_t like ordered_map). Building a
|
||||
// minimal reordering patch is a nontrivial (LCS-like)
|
||||
// problem; instead, remove every source key -- both
|
||||
// deleted keys (which must be removed regardless) and
|
||||
// common keys (removed so they can be re-added in
|
||||
// target's order) -- and re-add every key that should
|
||||
// remain, with its final target value, in target's
|
||||
// order. basic_json::patch()'s "add" operation on an
|
||||
// object uses operator[], which appends at the end for a
|
||||
// vector-backed insertion-ordered map when the key does
|
||||
// not already exist -- so removing a key and then adding
|
||||
// it moves it to the end, fixing its position.
|
||||
for (auto it = source.cbegin(); it != source.cend(); ++it)
|
||||
{
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
// found a key that is not in o -> remove it
|
||||
result.push_back(object(
|
||||
{
|
||||
{"op", "remove"}, {"path", path_key}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
// add every key that is either common (just removed
|
||||
// above) or brand new, in target's iteration order, so
|
||||
// that the final order after applying the patch matches
|
||||
// target exactly
|
||||
for (auto it = target.cbegin(); it != target.cend(); ++it)
|
||||
// second pass: traverse other object's elements
|
||||
for (auto it = target.cbegin(); it != target.cend(); ++it)
|
||||
{
|
||||
if (source.find(it.key()) == source.end())
|
||||
{
|
||||
// found a key that is not in this -> add it
|
||||
const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
|
||||
result.push_back(
|
||||
{
|
||||
@@ -27157,7 +26955,7 @@ struct formatter<nlohmann::NLOHMANN_BASIC_JSON_TPL, char> // NOLINT(cert-dcl58-c
|
||||
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
|
||||
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
|
||||
#undef JSON_HEDLEY_CLANG_HAS_FEATURE
|
||||
#undef JSON_HEDLEY_CLANG_HAS_WARNING
|
||||
@@ -27248,7 +27046,10 @@ struct formatter<nlohmann::NLOHMANN_BASIC_JSON_TPL, char> // NOLINT(cert-dcl58-c
|
||||
#undef JSON_HEDLEY_PELLES_VERSION_CHECK
|
||||
#undef JSON_HEDLEY_PGI_VERSION
|
||||
#undef JSON_HEDLEY_PGI_VERSION_CHECK
|
||||
#undef JSON_HEDLEY_PRAGMA
|
||||
#undef JSON_HEDLEY_PREDICT
|
||||
#undef JSON_HEDLEY_PREDICT_FALSE
|
||||
#undef JSON_HEDLEY_PREDICT_TRUE
|
||||
#undef JSON_HEDLEY_PRINTF_FORMAT
|
||||
#undef JSON_HEDLEY_PRIVATE
|
||||
#undef JSON_HEDLEY_PUBLIC
|
||||
|
||||
@@ -273,36 +273,5 @@ TEST_CASE("Regression tests for extended diagnostics")
|
||||
CHECK(j1["numbers"]["two"] == 2);
|
||||
CHECK(j1["string"] == "t");
|
||||
}
|
||||
|
||||
SECTION("Regression test - swap(array_t&)/swap(object_t&) must update JSON_DIAGNOSTICS parent pointers")
|
||||
{
|
||||
// swap(array_t&)
|
||||
{
|
||||
json j = json::array();
|
||||
json::array_t arr = {json::array({1})};
|
||||
j.swap(arr);
|
||||
|
||||
// parent pointers of the moved-in elements must point into j, not
|
||||
// into the now-defunct free-standing array_t
|
||||
CHECK_THROWS_WITH_AS(j[0][0].get<std::string>(), "[json.exception.type_error.302] (/0/0) type must be string, but is number", json::type_error);
|
||||
|
||||
// must not trigger assert_invariant() in a debug/assert-enabled build
|
||||
json const k = j;
|
||||
CHECK(k == j);
|
||||
}
|
||||
|
||||
// swap(object_t&)
|
||||
{
|
||||
json o = json::object();
|
||||
json::object_t obj = {{"a", json::array({1})}};
|
||||
o.swap(obj);
|
||||
|
||||
CHECK_THROWS_WITH_AS(o["a"][0].get<std::string>(), "[json.exception.type_error.302] (/a/0) type must be string, but is number", json::type_error);
|
||||
|
||||
// must not trigger assert_invariant() in a debug/assert-enabled build
|
||||
json const p = o;
|
||||
CHECK(p == o);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -641,20 +641,6 @@ TEST_CASE("modifiers")
|
||||
CHECK_THROWS_WITH_AS(j_array.insert(j_array.end(), j_other_array.begin(), j_other_array2.end()), "[json.exception.invalid_iterator.210] iterators do not fit",
|
||||
json::invalid_iterator&);
|
||||
}
|
||||
|
||||
SECTION("iterators not pointing into an array")
|
||||
{
|
||||
json j_object2 = {{"k", 1}, {"l", 2}};
|
||||
json j_primitive = 5;
|
||||
json j_null;
|
||||
|
||||
CHECK_THROWS_WITH_AS(j_array.insert(j_array.begin(), j_object2.begin(), j_object2.end()), "[json.exception.invalid_iterator.202] iterators first and last must point to arrays",
|
||||
json::invalid_iterator&);
|
||||
CHECK_THROWS_WITH_AS(j_array.insert(j_array.begin(), j_primitive.begin(), j_primitive.end()), "[json.exception.invalid_iterator.202] iterators first and last must point to arrays",
|
||||
json::invalid_iterator&);
|
||||
CHECK_THROWS_WITH_AS(j_array.insert(j_array.begin(), j_null.begin(), j_null.end()), "[json.exception.invalid_iterator.202] iterators first and last must point to arrays",
|
||||
json::invalid_iterator&);
|
||||
}
|
||||
}
|
||||
|
||||
SECTION("range for object")
|
||||
|
||||
@@ -0,0 +1,486 @@
|
||||
// __ _____ _____ _____
|
||||
// __| | __| | | | JSON for Modern C++
|
||||
// | | |__ | | | | | | version 3.12.0
|
||||
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
|
||||
//
|
||||
// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
// This file makes sure that none of the internal JSON_HEDLEY_* macros (vendored
|
||||
// from https://nemequ.github.io/hedley/, see
|
||||
// include/nlohmann/thirdparty/hedley/hedley.hpp) leak into the including
|
||||
// translation unit. include/nlohmann/detail/macro_unscope.hpp is supposed to
|
||||
// #undef every JSON_HEDLEY_* macro (via hedley_undef.hpp) once json.hpp has
|
||||
// been fully processed. See https://github.com/nlohmann/json/issues/5408,
|
||||
// where JSON_HEDLEY_PRAGMA, JSON_HEDLEY_PREDICT_TRUE, JSON_HEDLEY_PREDICT_FALSE,
|
||||
// and JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE escaped this cleanup because
|
||||
// hedley_undef.hpp had no matching #undef for them.
|
||||
//
|
||||
// The #ifdef/#error checks below are mechanically derived from the full list
|
||||
// of macro names in hedley_undef.hpp, so every JSON_HEDLEY_* macro is covered
|
||||
// -- not just the four that leaked historically.
|
||||
|
||||
#include "doctest_compatibility.h"
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#ifdef JSON_HEDLEY_ALWAYS_INLINE
|
||||
#error "JSON_HEDLEY_ALWAYS_INLINE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_ARM_VERSION
|
||||
#error "JSON_HEDLEY_ARM_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_ARM_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_ARM_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_ARRAY_PARAM
|
||||
#error "JSON_HEDLEY_ARRAY_PARAM must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_ASSUME
|
||||
#error "JSON_HEDLEY_ASSUME must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_BEGIN_C_DECLS
|
||||
#error "JSON_HEDLEY_BEGIN_C_DECLS must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_CLANG_HAS_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CLANG_HAS_BUILTIN
|
||||
#error "JSON_HEDLEY_CLANG_HAS_BUILTIN must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CLANG_HAS_EXTENSION
|
||||
#error "JSON_HEDLEY_CLANG_HAS_EXTENSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CLANG_HAS_FEATURE
|
||||
#error "JSON_HEDLEY_CLANG_HAS_FEATURE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CLANG_HAS_WARNING
|
||||
#error "JSON_HEDLEY_CLANG_HAS_WARNING must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_COMPCERT_VERSION
|
||||
#error "JSON_HEDLEY_COMPCERT_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_COMPCERT_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_COMPCERT_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CONCAT
|
||||
#error "JSON_HEDLEY_CONCAT must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CONCAT3
|
||||
#error "JSON_HEDLEY_CONCAT3 must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CONCAT3_EX
|
||||
#error "JSON_HEDLEY_CONCAT3_EX must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CONCAT_EX
|
||||
#error "JSON_HEDLEY_CONCAT_EX must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CONST
|
||||
#error "JSON_HEDLEY_CONST must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CONSTEXPR
|
||||
#error "JSON_HEDLEY_CONSTEXPR must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CONST_CAST
|
||||
#error "JSON_HEDLEY_CONST_CAST must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CPP_CAST
|
||||
#error "JSON_HEDLEY_CPP_CAST must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CRAY_VERSION
|
||||
#error "JSON_HEDLEY_CRAY_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_CRAY_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_CRAY_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_C_DECL
|
||||
#error "JSON_HEDLEY_C_DECL must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DEPRECATED
|
||||
#error "JSON_HEDLEY_DEPRECATED must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DEPRECATED_FOR
|
||||
#error "JSON_HEDLEY_DEPRECATED_FOR must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
|
||||
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
|
||||
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
|
||||
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
|
||||
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
|
||||
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
|
||||
#error "JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DIAGNOSTIC_POP
|
||||
#error "JSON_HEDLEY_DIAGNOSTIC_POP must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DIAGNOSTIC_PUSH
|
||||
#error "JSON_HEDLEY_DIAGNOSTIC_PUSH must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DMC_VERSION
|
||||
#error "JSON_HEDLEY_DMC_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_DMC_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_DMC_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_EMPTY_BASES
|
||||
#error "JSON_HEDLEY_EMPTY_BASES must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_EMSCRIPTEN_VERSION
|
||||
#error "JSON_HEDLEY_EMSCRIPTEN_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_END_C_DECLS
|
||||
#error "JSON_HEDLEY_END_C_DECLS must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_FALL_THROUGH
|
||||
#error "JSON_HEDLEY_FALL_THROUGH must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_FLAGS
|
||||
#error "JSON_HEDLEY_FLAGS must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_FLAGS_CAST
|
||||
#error "JSON_HEDLEY_FLAGS_CAST must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_GCC_HAS_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_HAS_BUILTIN
|
||||
#error "JSON_HEDLEY_GCC_HAS_BUILTIN must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_HAS_EXTENSION
|
||||
#error "JSON_HEDLEY_GCC_HAS_EXTENSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_HAS_FEATURE
|
||||
#error "JSON_HEDLEY_GCC_HAS_FEATURE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_HAS_WARNING
|
||||
#error "JSON_HEDLEY_GCC_HAS_WARNING must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_VERSION
|
||||
#error "JSON_HEDLEY_GCC_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GCC_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_GCC_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_GNUC_HAS_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_HAS_BUILTIN
|
||||
#error "JSON_HEDLEY_GNUC_HAS_BUILTIN must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_HAS_EXTENSION
|
||||
#error "JSON_HEDLEY_GNUC_HAS_EXTENSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_HAS_FEATURE
|
||||
#error "JSON_HEDLEY_GNUC_HAS_FEATURE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_HAS_WARNING
|
||||
#error "JSON_HEDLEY_GNUC_HAS_WARNING must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_VERSION
|
||||
#error "JSON_HEDLEY_GNUC_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_GNUC_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_GNUC_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_HAS_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_HAS_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_HAS_BUILTIN
|
||||
#error "JSON_HEDLEY_HAS_BUILTIN must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_HAS_CPP_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
|
||||
#error "JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
|
||||
#error "JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_HAS_EXTENSION
|
||||
#error "JSON_HEDLEY_HAS_EXTENSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_HAS_FEATURE
|
||||
#error "JSON_HEDLEY_HAS_FEATURE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_HAS_WARNING
|
||||
#error "JSON_HEDLEY_HAS_WARNING must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_IAR_VERSION
|
||||
#error "JSON_HEDLEY_IAR_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_IAR_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_IAR_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_IBM_VERSION
|
||||
#error "JSON_HEDLEY_IBM_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_IBM_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_IBM_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_IMPORT
|
||||
#error "JSON_HEDLEY_IMPORT must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_INLINE
|
||||
#error "JSON_HEDLEY_INLINE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_INTEL_CL_VERSION
|
||||
#error "JSON_HEDLEY_INTEL_CL_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_INTEL_CL_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_INTEL_VERSION
|
||||
#error "JSON_HEDLEY_INTEL_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_INTEL_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_INTEL_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_IS_CONSTANT
|
||||
#error "JSON_HEDLEY_IS_CONSTANT must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_IS_CONSTEXPR_
|
||||
#error "JSON_HEDLEY_IS_CONSTEXPR_ must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_LIKELY
|
||||
#error "JSON_HEDLEY_LIKELY must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_MALLOC
|
||||
#error "JSON_HEDLEY_MALLOC must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_MCST_LCC_VERSION
|
||||
#error "JSON_HEDLEY_MCST_LCC_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_MCST_LCC_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_MESSAGE
|
||||
#error "JSON_HEDLEY_MESSAGE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_MSVC_VERSION
|
||||
#error "JSON_HEDLEY_MSVC_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_MSVC_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_MSVC_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_NEVER_INLINE
|
||||
#error "JSON_HEDLEY_NEVER_INLINE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_NON_NULL
|
||||
#error "JSON_HEDLEY_NON_NULL must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_NO_ESCAPE
|
||||
#error "JSON_HEDLEY_NO_ESCAPE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_NO_RETURN
|
||||
#error "JSON_HEDLEY_NO_RETURN must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_NO_THROW
|
||||
#error "JSON_HEDLEY_NO_THROW must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_NULL
|
||||
#error "JSON_HEDLEY_NULL must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PELLES_VERSION
|
||||
#error "JSON_HEDLEY_PELLES_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PELLES_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_PELLES_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PGI_VERSION
|
||||
#error "JSON_HEDLEY_PGI_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PGI_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_PGI_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PRAGMA
|
||||
#error "JSON_HEDLEY_PRAGMA must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PREDICT
|
||||
#error "JSON_HEDLEY_PREDICT must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PREDICT_FALSE
|
||||
#error "JSON_HEDLEY_PREDICT_FALSE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PREDICT_TRUE
|
||||
#error "JSON_HEDLEY_PREDICT_TRUE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PRINTF_FORMAT
|
||||
#error "JSON_HEDLEY_PRINTF_FORMAT must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PRIVATE
|
||||
#error "JSON_HEDLEY_PRIVATE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PUBLIC
|
||||
#error "JSON_HEDLEY_PUBLIC must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_PURE
|
||||
#error "JSON_HEDLEY_PURE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_REINTERPRET_CAST
|
||||
#error "JSON_HEDLEY_REINTERPRET_CAST must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_REQUIRE
|
||||
#error "JSON_HEDLEY_REQUIRE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_REQUIRE_CONSTEXPR
|
||||
#error "JSON_HEDLEY_REQUIRE_CONSTEXPR must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_REQUIRE_MSG
|
||||
#error "JSON_HEDLEY_REQUIRE_MSG must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_RESTRICT
|
||||
#error "JSON_HEDLEY_RESTRICT must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_RETURNS_NON_NULL
|
||||
#error "JSON_HEDLEY_RETURNS_NON_NULL must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_SENTINEL
|
||||
#error "JSON_HEDLEY_SENTINEL must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_STATIC_ASSERT
|
||||
#error "JSON_HEDLEY_STATIC_ASSERT must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_STATIC_CAST
|
||||
#error "JSON_HEDLEY_STATIC_CAST must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_STRINGIFY
|
||||
#error "JSON_HEDLEY_STRINGIFY must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_STRINGIFY_EX
|
||||
#error "JSON_HEDLEY_STRINGIFY_EX must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_SUNPRO_VERSION
|
||||
#error "JSON_HEDLEY_SUNPRO_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_SUNPRO_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_SUNPRO_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TINYC_VERSION
|
||||
#error "JSON_HEDLEY_TINYC_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TINYC_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_TINYC_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_ARMCL_VERSION
|
||||
#error "JSON_HEDLEY_TI_ARMCL_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_TI_ARMCL_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CL2000_VERSION
|
||||
#error "JSON_HEDLEY_TI_CL2000_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_TI_CL2000_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CL430_VERSION
|
||||
#error "JSON_HEDLEY_TI_CL430_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CL430_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_TI_CL430_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CL6X_VERSION
|
||||
#error "JSON_HEDLEY_TI_CL6X_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_TI_CL6X_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CL7X_VERSION
|
||||
#error "JSON_HEDLEY_TI_CL7X_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_TI_CL7X_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CLPRU_VERSION
|
||||
#error "JSON_HEDLEY_TI_CLPRU_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_TI_CLPRU_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_VERSION
|
||||
#error "JSON_HEDLEY_TI_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_TI_VERSION_CHECK
|
||||
#error "JSON_HEDLEY_TI_VERSION_CHECK must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_UNAVAILABLE
|
||||
#error "JSON_HEDLEY_UNAVAILABLE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_UNLIKELY
|
||||
#error "JSON_HEDLEY_UNLIKELY must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_UNPREDICTABLE
|
||||
#error "JSON_HEDLEY_UNPREDICTABLE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_UNREACHABLE
|
||||
#error "JSON_HEDLEY_UNREACHABLE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_UNREACHABLE_RETURN
|
||||
#error "JSON_HEDLEY_UNREACHABLE_RETURN must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_VERSION
|
||||
#error "JSON_HEDLEY_VERSION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_VERSION_DECODE_MAJOR
|
||||
#error "JSON_HEDLEY_VERSION_DECODE_MAJOR must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_VERSION_DECODE_MINOR
|
||||
#error "JSON_HEDLEY_VERSION_DECODE_MINOR must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_VERSION_DECODE_REVISION
|
||||
#error "JSON_HEDLEY_VERSION_DECODE_REVISION must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_VERSION_ENCODE
|
||||
#error "JSON_HEDLEY_VERSION_ENCODE must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_WARNING
|
||||
#error "JSON_HEDLEY_WARNING must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_WARN_UNUSED_RESULT
|
||||
#error "JSON_HEDLEY_WARN_UNUSED_RESULT must not remain defined after including json.hpp"
|
||||
#endif
|
||||
#ifdef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
|
||||
#error "JSON_HEDLEY_WARN_UNUSED_RESULT_MSG must not remain defined after including json.hpp"
|
||||
#endif
|
||||
|
||||
TEST_CASE("no JSON_HEDLEY_* macro leaks after including json.hpp")
|
||||
{
|
||||
// if this test compiles at all, none of the JSON_HEDLEY_* macros checked
|
||||
// above remained defined after including <nlohmann/json.hpp>
|
||||
CHECK(true);
|
||||
}
|
||||
@@ -81,84 +81,3 @@ TEST_CASE("regression test for issue #3732 - iteration_proxy_value<iter_impl<ord
|
||||
};
|
||||
static_cast<void>(fn);
|
||||
}
|
||||
|
||||
TEST_CASE("regression test - diff() must account for ordered_json member order")
|
||||
{
|
||||
SECTION("pure reorder, no value changes")
|
||||
{
|
||||
ordered_json a = {{"a", 1}, {"b", 2}};
|
||||
ordered_json b = {{"b", 2}, {"a", 1}};
|
||||
CHECK(a != b); // order-sensitive equality
|
||||
CHECK(a.patch(ordered_json::diff(a, b)) == b);
|
||||
}
|
||||
|
||||
SECTION("new key must land at the front")
|
||||
{
|
||||
ordered_json c = {{"b", 2}};
|
||||
ordered_json e = {{"a", 1}, {"b", 2}};
|
||||
CHECK(c.patch(ordered_json::diff(c, e)) == e);
|
||||
}
|
||||
|
||||
SECTION("reorder plus a value change on one of the reordered keys")
|
||||
{
|
||||
ordered_json a = {{"a", 1}, {"b", 2}};
|
||||
ordered_json b = {{"b", 20}, {"a", 1}};
|
||||
CHECK(a != b);
|
||||
CHECK(a.patch(ordered_json::diff(a, b)) == b);
|
||||
}
|
||||
|
||||
SECTION("reorder plus a deleted key")
|
||||
{
|
||||
ordered_json a = {{"a", 1}, {"b", 2}, {"c", 3}};
|
||||
ordered_json b = {{"b", 2}, {"a", 1}};
|
||||
CHECK(a != b);
|
||||
CHECK(a.patch(ordered_json::diff(a, b)) == b);
|
||||
}
|
||||
|
||||
SECTION("reorder plus a nested value that itself needs a recursive diff")
|
||||
{
|
||||
ordered_json a = {{"a", {{"x", 1}, {"y", 2}}}, {"b", 2}};
|
||||
ordered_json b = {{"b", 2}, {"a", {{"x", 1}, {"y", 99}}}};
|
||||
CHECK(a != b);
|
||||
CHECK(a.patch(ordered_json::diff(a, b)) == b);
|
||||
}
|
||||
|
||||
SECTION("three or more keys shuffled into a different order")
|
||||
{
|
||||
ordered_json a = {{"a", 1}, {"b", 2}, {"c", 3}, {"d", 4}};
|
||||
ordered_json b = {{"d", 4}, {"b", 2}, {"a", 1}, {"c", 3}};
|
||||
CHECK(a != b);
|
||||
CHECK(a.patch(ordered_json::diff(a, b)) == b);
|
||||
}
|
||||
|
||||
SECTION("matching order still produces a minimal patch (fast path unaffected)")
|
||||
{
|
||||
ordered_json a = {{"a", 1}, {"b", 2}, {"c", 3}};
|
||||
ordered_json b = {{"a", 1}, {"b", 20}, {"c", 3}};
|
||||
auto p = ordered_json::diff(a, b);
|
||||
// only the changed value should be touched, not a wholesale remove+add
|
||||
CHECK(p.size() == 1);
|
||||
CHECK(p[0]["op"] == "replace");
|
||||
CHECK(p[0]["path"] == "/b");
|
||||
CHECK(a.patch(p) == b);
|
||||
}
|
||||
|
||||
SECTION("plain json (std::map-backed) is unaffected by same-key-different-insertion-order")
|
||||
{
|
||||
json a;
|
||||
a["b"] = 2;
|
||||
a["a"] = 1;
|
||||
|
||||
json b;
|
||||
b["a"] = 1;
|
||||
b["b"] = 2;
|
||||
|
||||
// std::map iteration is always sorted by key, so a == b regardless of
|
||||
// insertion order, and diff() must still produce the same minimal
|
||||
// (empty) result as before this fix
|
||||
CHECK(a == b);
|
||||
auto p = json::diff(a, b);
|
||||
CHECK(p.empty());
|
||||
CHECK(a.patch(p) == b);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1566,106 +1566,4 @@ TEST_CASE("issue #5402 - update(merge_objects=true) overwrites a primitive with
|
||||
CHECK(mixed == json({{"keep", {{"a", 1}, {"b", 2}}}, {"replace", {{"x", 2}}}}));
|
||||
}
|
||||
|
||||
TEST_CASE("regression test - parser callback must not lose a duplicate key's prior value")
|
||||
{
|
||||
// a callback that rejects only the scalar value 2
|
||||
const json::parser_callback_t drop_value_2 = [](int /*depth*/, json::parse_event_t ev, json & v) noexcept
|
||||
{
|
||||
return !(ev == json::parse_event_t::value && v == 2);
|
||||
};
|
||||
|
||||
SECTION("duplicate key, second (scalar) value rejected - prior value is restored")
|
||||
{
|
||||
const json j = json::parse(R"({"a":1,"a":2})", drop_value_2);
|
||||
CHECK(j.dump() == "{\"a\":1}");
|
||||
}
|
||||
|
||||
SECTION("duplicate key, second value is an object rejected at object_end - prior value is restored")
|
||||
{
|
||||
const json j = json::parse(R"({"a":1,"a":{"x":2}})",
|
||||
[](int depth, json::parse_event_t ev, json& /*parsed*/) noexcept
|
||||
{
|
||||
return !(ev == json::parse_event_t::object_end && depth == 1);
|
||||
});
|
||||
CHECK(j.dump() == "{\"a\":1}");
|
||||
}
|
||||
|
||||
SECTION("duplicate key, second value is an array rejected at array_end - prior value is restored")
|
||||
{
|
||||
const json j = json::parse(R"({"a":1,"a":[9,9]})",
|
||||
[](int depth, json::parse_event_t ev, json& /*parsed*/) noexcept
|
||||
{
|
||||
return !(ev == json::parse_event_t::array_end && depth == 1);
|
||||
});
|
||||
CHECK(j.dump() == "{\"a\":1}");
|
||||
}
|
||||
|
||||
SECTION("duplicate key, second value accepted (scalar) - last value wins")
|
||||
{
|
||||
const json j = json::parse(R"({"a":1,"a":2})", [](int, json::parse_event_t, json&) noexcept
|
||||
{
|
||||
return true;
|
||||
});
|
||||
CHECK(j.dump() == "{\"a\":2}");
|
||||
}
|
||||
|
||||
SECTION("duplicate key, second value accepted (object) - last value wins")
|
||||
{
|
||||
const json j = json::parse(R"({"a":1,"a":{"x":2}})", [](int, json::parse_event_t, json&) noexcept
|
||||
{
|
||||
return true;
|
||||
});
|
||||
CHECK(j.dump() == "{\"a\":{\"x\":2}}");
|
||||
}
|
||||
|
||||
SECTION("brand new (non-duplicate) key, value rejected - member is fully absent")
|
||||
{
|
||||
const json j = json::parse(R"({"a":1,"b":2})", drop_value_2);
|
||||
CHECK(j.dump() == "{\"a\":1}");
|
||||
}
|
||||
|
||||
SECTION("duplicate key nested two levels deep")
|
||||
{
|
||||
const json j = json::parse(R"({"outer":{"a":1,"a":2}})", drop_value_2);
|
||||
CHECK(j.dump() == "{\"outer\":{\"a\":1}}");
|
||||
}
|
||||
|
||||
SECTION("three occurrences of the same key - middle rejected, last accepted")
|
||||
{
|
||||
const json j = json::parse(R"({"k":1,"k":2,"k":3})", drop_value_2);
|
||||
CHECK(j.dump() == "{\"k\":3}");
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("regression test - excessive binary container size honors allow_exceptions=false")
|
||||
{
|
||||
// CBOR array with declared length 2^63
|
||||
const std::vector<std::uint8_t> cbor = {0x9b, 0x80, 0, 0, 0, 0, 0, 0, 0};
|
||||
// CBOR map with declared length 2^63
|
||||
const std::vector<std::uint8_t> cbor_m = {0xbb, 0x80, 0, 0, 0, 0, 0, 0, 0};
|
||||
// UBJSON array with declared length 2^63-1
|
||||
const std::vector<std::uint8_t> ubj = {'[', '#', 'L', 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
||||
// BJData array with declared length 2^63-1 (little endian)
|
||||
const std::vector<std::uint8_t> bjd = {'[', '#', 'L', 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f};
|
||||
|
||||
// allow_exceptions=false must report failure instead of throwing/aborting
|
||||
CHECK(json::from_cbor(cbor, true, false).is_discarded());
|
||||
CHECK(json::from_cbor(cbor_m, true, false).is_discarded());
|
||||
CHECK(json::from_ubjson(ubj, true, false).is_discarded());
|
||||
CHECK(json::from_bjdata(bjd, true, false).is_discarded());
|
||||
|
||||
// allow_exceptions=true (the default) must still throw exactly as before.
|
||||
// The exact message text is not checked here: on platforms where
|
||||
// std::size_t is 32-bit, the CBOR reader's own length-narrowing check
|
||||
// (get_cbor_container_size(), unrelated to this fix) intercepts a
|
||||
// declared length of 2^63 before it ever reaches the check this test
|
||||
// targets, with different (but equally valid, and already correct)
|
||||
// wording -- see unit-cbor.cpp for coverage of that message.
|
||||
json _;
|
||||
CHECK_THROWS_AS(_ = json::from_cbor(cbor), json::out_of_range);
|
||||
|
||||
// regression guard: a genuinely truncated CBOR input must remain discarded
|
||||
CHECK(json::from_cbor(std::vector<std::uint8_t> {0x9b, 0, 0, 0, 0, 0, 0, 0, 0x02}, true, false).is_discarded());
|
||||
}
|
||||
|
||||
DOCTEST_CLANG_SUPPRESS_WARNING_POP
|
||||
|
||||
Reference in New Issue
Block a user