mirror of
https://github.com/nlohmann/json.git
synced 2026-09-06 16:27:59 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eca15ca0e5 |
@@ -1,4 +1,4 @@
|
|||||||
.PHONY: pretty clean ChangeLog.md release update_hedley update_hedley_undef
|
.PHONY: pretty clean ChangeLog.md release
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
# configuration
|
# configuration
|
||||||
@@ -41,8 +41,6 @@ all:
|
|||||||
@echo "fuzz_testing_ubjson - prepare fuzz testing of the UBJSON parser"
|
@echo "fuzz_testing_ubjson - prepare fuzz testing of the UBJSON parser"
|
||||||
@echo "pretty - beautify code with Artistic Style"
|
@echo "pretty - beautify code with Artistic Style"
|
||||||
@echo "run_benchmarks - build and run benchmarks"
|
@echo "run_benchmarks - build and run benchmarks"
|
||||||
@echo "update_hedley - download Hedley and regenerate hedley.hpp / hedley_undef.hpp"
|
|
||||||
@echo "update_hedley_undef - rebuild hedley_undef.hpp from the JSON_HEDLEY_* #define names in hedley.hpp"
|
|
||||||
|
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
@@ -243,24 +241,11 @@ update_hedley:
|
|||||||
rm -f include/nlohmann/thirdparty/hedley/hedley.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp
|
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
|
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
|
$(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
|
||||||
$(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.hpp
|
||||||
$(MAKE) update_hedley_undef
|
$(SED) -i '1s/^/#pragma once\n\n/' include/nlohmann/thirdparty/hedley/hedley_undef.hpp
|
||||||
$(MAKE) amalgamate
|
$(MAKE) amalgamate
|
||||||
|
|
||||||
# Rebuild hedley_undef.hpp from every JSON_HEDLEY_* name that hedley.hpp
|
|
||||||
# #defines. Hedley does not #undef all of its public macros internally (see
|
|
||||||
# #5408), so grepping those #undef lines misses names such as
|
|
||||||
# JSON_HEDLEY_PRAGMA. cmake/scripts/gen_hedley_undef_check.cmake is the
|
|
||||||
# single source of truth for this extraction (tests/CMakeLists.txt uses the
|
|
||||||
# same script, in MODE=checks, to generate the matching leak-check test), so
|
|
||||||
# the vendored header, the generated #undef list, and the regression test
|
|
||||||
# cannot drift apart.
|
|
||||||
update_hedley_undef:
|
|
||||||
cmake -DHEDLEY_HPP=include/nlohmann/thirdparty/hedley/hedley.hpp \
|
|
||||||
-DOUTPUT=include/nlohmann/thirdparty/hedley/hedley_undef.hpp \
|
|
||||||
-DMODE=undef \
|
|
||||||
-P cmake/scripts/gen_hedley_undef_check.cmake
|
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
# serve_header.py
|
# serve_header.py
|
||||||
##########################################################################
|
##########################################################################
|
||||||
|
|||||||
@@ -1,112 +0,0 @@
|
|||||||
# Shared extractor for the JSON_HEDLEY_* macro names defined in hedley.hpp.
|
|
||||||
#
|
|
||||||
# Every macro that hedley.hpp #defines must be #undef-ed again once json.hpp
|
|
||||||
# has been fully processed (see include/nlohmann/detail/macro_unscope.hpp
|
|
||||||
# and https://github.com/nlohmann/json/issues/5408). Deriving the macro list
|
|
||||||
# straight from hedley.hpp here -- instead of hand-maintaining it in two
|
|
||||||
# places -- means hedley_undef.hpp and the regression test that checks for
|
|
||||||
# leaked macros can never drift apart, even after a future `make
|
|
||||||
# update_hedley` pulls in new macros from upstream Hedley.
|
|
||||||
#
|
|
||||||
# MODE=undef (default): write hedley_undef.hpp (SPDX header, #pragma once,
|
|
||||||
# one #undef per macro name) -- used by `make update_hedley_undef`
|
|
||||||
# MODE=checks: write one #ifdef/FAIL_CHECK/#endif per macro name,
|
|
||||||
# meant to be #include-d inside a TEST_CASE -- used by
|
|
||||||
# tests/CMakeLists.txt to (re)generate the include for
|
|
||||||
# tests/src/unit-no-macro-leak.cpp
|
|
||||||
#
|
|
||||||
# Required variables:
|
|
||||||
# HEDLEY_HPP path to include/nlohmann/thirdparty/hedley/hedley.hpp
|
|
||||||
# OUTPUT path of the file to (over)write
|
|
||||||
# Optional:
|
|
||||||
# MODE "undef" (default) or "checks"
|
|
||||||
|
|
||||||
if(NOT DEFINED HEDLEY_HPP OR NOT DEFINED OUTPUT)
|
|
||||||
message(FATAL_ERROR "HEDLEY_HPP and OUTPUT must be set")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT EXISTS "${HEDLEY_HPP}")
|
|
||||||
message(FATAL_ERROR "Hedley header not found: ${HEDLEY_HPP}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT DEFINED MODE)
|
|
||||||
set(MODE undef)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT MODE STREQUAL "undef" AND NOT MODE STREQUAL "checks")
|
|
||||||
message(FATAL_ERROR "MODE must be undef or checks, got: ${MODE}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Line-anchored, like `grep -oE "^[[:blank:]]*#[[:blank:]]*define[[:blank:]]+JSON_HEDLEY_[A-Za-z0-9_]+"`.
|
|
||||||
# Unanchored matching would also pick up JSON_HEDLEY_* mentions inside
|
|
||||||
# comments or string literals elsewhere in the file, which must not turn
|
|
||||||
# into #undef lines.
|
|
||||||
file(STRINGS "${HEDLEY_HPP}" hedley_lines)
|
|
||||||
set(macro_names)
|
|
||||||
foreach(line IN LISTS hedley_lines)
|
|
||||||
if("${line}" MATCHES "^[ \t]*#[ \t]*define[ \t]+(JSON_HEDLEY_[A-Za-z0-9_]+)")
|
|
||||||
list(APPEND macro_names "${CMAKE_MATCH_1}")
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
if(NOT macro_names)
|
|
||||||
message(FATAL_ERROR "No JSON_HEDLEY_* macros found in ${HEDLEY_HPP}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list(REMOVE_DUPLICATES macro_names)
|
|
||||||
# Lexicographic, locale-independent (ASCII-only names) -- matches `LC_ALL=C sort`.
|
|
||||||
list(SORT macro_names COMPARE STRING)
|
|
||||||
list(LENGTH macro_names macro_count)
|
|
||||||
|
|
||||||
set(generated "")
|
|
||||||
if(MODE STREQUAL "undef")
|
|
||||||
# Same banner `make update_hedley_undef` would stamp by hand, so the
|
|
||||||
# recipe is self-contained and its output is byte-stable across reruns.
|
|
||||||
# The embedded SPDX tags below are part of the *generated* file's
|
|
||||||
# content, not a REUSE header for this .cmake script itself (which is
|
|
||||||
# already covered by the blanket "Files: *" rule in .reuse/dep5) -- keep
|
|
||||||
# them wrapped in REUSE-IgnoreStart/End so `reuse lint` does not try to
|
|
||||||
# parse "MIT\n")" as this file's own SPDX-License-Identifier value.
|
|
||||||
# REUSE-IgnoreStart
|
|
||||||
string(APPEND generated "// __ _____ _____ _____\n")
|
|
||||||
string(APPEND generated "// __| | __| | | | JSON for Modern C++\n")
|
|
||||||
string(APPEND generated "// | | |__ | | | | | | version 3.12.0\n")
|
|
||||||
string(APPEND generated "// |_____|_____|_____|_|___| https://github.com/nlohmann/json\n")
|
|
||||||
string(APPEND generated "//\n")
|
|
||||||
string(APPEND generated "// SPDX-FileCopyrightText: 2013-2026 Niels Lohmann <https://nlohmann.me>\n")
|
|
||||||
string(APPEND generated "// SPDX-License-Identifier: MIT\n")
|
|
||||||
# REUSE-IgnoreEnd
|
|
||||||
string(APPEND generated "\n")
|
|
||||||
string(APPEND generated "#pragma once\n")
|
|
||||||
string(APPEND generated "\n")
|
|
||||||
foreach(name IN LISTS macro_names)
|
|
||||||
string(APPEND generated "#undef ${name}\n")
|
|
||||||
endforeach()
|
|
||||||
else()
|
|
||||||
string(APPEND generated "// This file is generated by cmake/scripts/gen_hedley_undef_check.cmake\n")
|
|
||||||
string(APPEND generated "// from include/nlohmann/thirdparty/hedley/hedley.hpp. Do not edit it by\n")
|
|
||||||
string(APPEND generated "// hand -- it is regenerated on every build. ${macro_count} macros checked.\n\n")
|
|
||||||
foreach(name IN LISTS macro_names)
|
|
||||||
string(APPEND generated "#ifdef ${name}\n")
|
|
||||||
string(APPEND generated " FAIL_CHECK(\"${name} leaked after including nlohmann/json.hpp\");\n")
|
|
||||||
string(APPEND generated "#endif\n")
|
|
||||||
endforeach()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
get_filename_component(output_dir "${OUTPUT}" DIRECTORY)
|
|
||||||
if(output_dir)
|
|
||||||
file(MAKE_DIRECTORY "${output_dir}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Avoid rewriting the file (and busting downstream incremental rebuilds)
|
|
||||||
# when the content has not actually changed.
|
|
||||||
set(write_output TRUE)
|
|
||||||
if(EXISTS "${OUTPUT}")
|
|
||||||
file(READ "${OUTPUT}" existing_content)
|
|
||||||
if(existing_content STREQUAL generated)
|
|
||||||
set(write_output FALSE)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
if(write_output)
|
|
||||||
file(WRITE "${OUTPUT}" "${generated}")
|
|
||||||
endif()
|
|
||||||
@@ -34,6 +34,8 @@ Strong guarantee: if an exception is thrown, there are no changes in the JSON va
|
|||||||
("add", "remove", "move")
|
("add", "remove", "move")
|
||||||
- Throws [`out_of_range.411`](../../home/exceptions.md#jsonexceptionout_of_range411) if an "add" operation's target
|
- Throws [`out_of_range.411`](../../home/exceptions.md#jsonexceptionout_of_range411) if an "add" operation's target
|
||||||
location has a parent that is neither an object nor an array.
|
location has a parent that is neither an object nor an array.
|
||||||
|
- Throws [`out_of_range.413`](../../home/exceptions.md#jsonexceptionout_of_range413) if a "remove" operation's target
|
||||||
|
location has a parent that is neither an object nor an array.
|
||||||
- Throws [`other_error.501`](../../home/exceptions.md#jsonexceptionother_error501) if "test" operation was
|
- Throws [`other_error.501`](../../home/exceptions.md#jsonexceptionother_error501) if "test" operation was
|
||||||
unsuccessful.
|
unsuccessful.
|
||||||
|
|
||||||
@@ -75,3 +77,5 @@ is thrown. In any case, the original value is not changed: the patch is applied
|
|||||||
- Added in version 2.0.0.
|
- Added in version 2.0.0.
|
||||||
- Added [`out_of_range.411`](../../home/exceptions.md#jsonexceptionout_of_range411) and stopped relying on an internal assertion when an "add" operation's
|
- Added [`out_of_range.411`](../../home/exceptions.md#jsonexceptionout_of_range411) and stopped relying on an internal assertion when an "add" operation's
|
||||||
target location has a non-object/non-array parent in version 3.13.0.
|
target location has a non-object/non-array parent in version 3.13.0.
|
||||||
|
- Added [`out_of_range.413`](../../home/exceptions.md#jsonexceptionout_of_range413) and stopped silently ignoring a "remove" operation whose target
|
||||||
|
location has a non-object/non-array parent in version 3.13.0.
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ No guarantees, value may be corrupted by an unsuccessful patch operation.
|
|||||||
("add", "remove", "move")
|
("add", "remove", "move")
|
||||||
- Throws [`out_of_range.411`](../../home/exceptions.md#jsonexceptionout_of_range411) if an "add" operation's target
|
- Throws [`out_of_range.411`](../../home/exceptions.md#jsonexceptionout_of_range411) if an "add" operation's target
|
||||||
location has a parent that is neither an object nor an array.
|
location has a parent that is neither an object nor an array.
|
||||||
|
- Throws [`out_of_range.413`](../../home/exceptions.md#jsonexceptionout_of_range413) if a "remove" operation's target
|
||||||
|
location has a parent that is neither an object nor an array.
|
||||||
- Throws [`other_error.501`](../../home/exceptions.md#jsonexceptionother_error501) if "test" operation was
|
- Throws [`other_error.501`](../../home/exceptions.md#jsonexceptionother_error501) if "test" operation was
|
||||||
unsuccessful.
|
unsuccessful.
|
||||||
|
|
||||||
@@ -72,3 +74,5 @@ function throws an exception.
|
|||||||
- Added in version 3.11.0.
|
- Added in version 3.11.0.
|
||||||
- Added [`out_of_range.411`](../../home/exceptions.md#jsonexceptionout_of_range411) and stopped relying on an internal assertion when an "add" operation's
|
- Added [`out_of_range.411`](../../home/exceptions.md#jsonexceptionout_of_range411) and stopped relying on an internal assertion when an "add" operation's
|
||||||
target location has a non-object/non-array parent in version 3.13.0.
|
target location has a non-object/non-array parent in version 3.13.0.
|
||||||
|
- Added [`out_of_range.413`](../../home/exceptions.md#jsonexceptionout_of_range413) and stopped silently ignoring a "remove" operation whose target
|
||||||
|
location has a non-object/non-array parent in version 3.13.0.
|
||||||
|
|||||||
@@ -933,6 +933,20 @@ BSON stores the length of documents, arrays, strings, and binary values in a sig
|
|||||||
[`to_bson`](../api/basic_json/to_bson.md) produced documents with negative length prefixes that
|
[`to_bson`](../api/basic_json/to_bson.md) produced documents with negative length prefixes that
|
||||||
[`from_bson`](../api/basic_json/from_bson.md) rejected.
|
[`from_bson`](../api/basic_json/from_bson.md) rejected.
|
||||||
|
|
||||||
|
### json.exception.out_of_range.413
|
||||||
|
|
||||||
|
A JSON Patch `remove` operation cannot be applied because the target location's parent is neither an object nor an array. Per [RFC 6902](https://datatracker.ietf.org/doc/html/rfc6902), a `remove` target must reference a member of an existing object or an element of an existing array; a primitive value (string, number, boolean, etc.) or `null` has no members or elements to remove.
|
||||||
|
|
||||||
|
!!! failure "Example message"
|
||||||
|
|
||||||
|
```
|
||||||
|
cannot remove value: the JSON Patch 'remove' target's parent is of type number, but must be an object or array
|
||||||
|
```
|
||||||
|
|
||||||
|
!!! note
|
||||||
|
|
||||||
|
This exception was added in version 3.13.0. Before that, this situation was silently ignored (the `remove` operation had no effect).
|
||||||
|
|
||||||
## Further exceptions
|
## Further exceptions
|
||||||
|
|
||||||
This exception is thrown in case of errors that cannot be classified with the
|
This exception is thrown in case of errors that cannot be classified with the
|
||||||
|
|||||||
@@ -4939,6 +4939,12 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|||||||
// note erase performs range check
|
// note erase performs range check
|
||||||
parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
|
parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// the parent of a "remove" target must be an object or array
|
||||||
|
// (see #5396)
|
||||||
|
JSON_THROW(out_of_range::create(413, detail::concat("cannot remove value: the JSON Patch 'remove' target's parent is of type ", parent.type_name(), ", but must be an object or array"), &parent));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// type check: top level value must be an array
|
// type check: top level value must be an array
|
||||||
|
|||||||
+1
-4
@@ -17,7 +17,7 @@
|
|||||||
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
|
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
|
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
|
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE
|
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
|
#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_FEATURE
|
#undef JSON_HEDLEY_CLANG_HAS_FEATURE
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_WARNING
|
#undef JSON_HEDLEY_CLANG_HAS_WARNING
|
||||||
@@ -108,10 +108,7 @@
|
|||||||
#undef JSON_HEDLEY_PELLES_VERSION_CHECK
|
#undef JSON_HEDLEY_PELLES_VERSION_CHECK
|
||||||
#undef JSON_HEDLEY_PGI_VERSION
|
#undef JSON_HEDLEY_PGI_VERSION
|
||||||
#undef JSON_HEDLEY_PGI_VERSION_CHECK
|
#undef JSON_HEDLEY_PGI_VERSION_CHECK
|
||||||
#undef JSON_HEDLEY_PRAGMA
|
|
||||||
#undef JSON_HEDLEY_PREDICT
|
#undef JSON_HEDLEY_PREDICT
|
||||||
#undef JSON_HEDLEY_PREDICT_FALSE
|
|
||||||
#undef JSON_HEDLEY_PREDICT_TRUE
|
|
||||||
#undef JSON_HEDLEY_PRINTF_FORMAT
|
#undef JSON_HEDLEY_PRINTF_FORMAT
|
||||||
#undef JSON_HEDLEY_PRIVATE
|
#undef JSON_HEDLEY_PRIVATE
|
||||||
#undef JSON_HEDLEY_PUBLIC
|
#undef JSON_HEDLEY_PUBLIC
|
||||||
|
|||||||
@@ -26367,6 +26367,12 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
|
|||||||
// note erase performs range check
|
// note erase performs range check
|
||||||
parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
|
parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// the parent of a "remove" target must be an object or array
|
||||||
|
// (see #5396)
|
||||||
|
JSON_THROW(out_of_range::create(413, detail::concat("cannot remove value: the JSON Patch 'remove' target's parent is of type ", parent.type_name(), ", but must be an object or array"), &parent));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// type check: top level value must be an array
|
// type check: top level value must be an array
|
||||||
@@ -26965,7 +26971,7 @@ struct formatter<nlohmann::NLOHMANN_BASIC_JSON_TPL, char> // NOLINT(cert-dcl58-c
|
|||||||
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
|
#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
|
#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
|
#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE
|
#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
|
#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_FEATURE
|
#undef JSON_HEDLEY_CLANG_HAS_FEATURE
|
||||||
#undef JSON_HEDLEY_CLANG_HAS_WARNING
|
#undef JSON_HEDLEY_CLANG_HAS_WARNING
|
||||||
@@ -27056,10 +27062,7 @@ struct formatter<nlohmann::NLOHMANN_BASIC_JSON_TPL, char> // NOLINT(cert-dcl58-c
|
|||||||
#undef JSON_HEDLEY_PELLES_VERSION_CHECK
|
#undef JSON_HEDLEY_PELLES_VERSION_CHECK
|
||||||
#undef JSON_HEDLEY_PGI_VERSION
|
#undef JSON_HEDLEY_PGI_VERSION
|
||||||
#undef JSON_HEDLEY_PGI_VERSION_CHECK
|
#undef JSON_HEDLEY_PGI_VERSION_CHECK
|
||||||
#undef JSON_HEDLEY_PRAGMA
|
|
||||||
#undef JSON_HEDLEY_PREDICT
|
#undef JSON_HEDLEY_PREDICT
|
||||||
#undef JSON_HEDLEY_PREDICT_FALSE
|
|
||||||
#undef JSON_HEDLEY_PREDICT_TRUE
|
|
||||||
#undef JSON_HEDLEY_PRINTF_FORMAT
|
#undef JSON_HEDLEY_PRINTF_FORMAT
|
||||||
#undef JSON_HEDLEY_PRIVATE
|
#undef JSON_HEDLEY_PRIVATE
|
||||||
#undef JSON_HEDLEY_PUBLIC
|
#undef JSON_HEDLEY_PUBLIC
|
||||||
|
|||||||
@@ -125,51 +125,6 @@ json_test_set_test_options(test-unicode4 TEST_PROPERTIES TIMEOUT 3000)
|
|||||||
# add unit tests
|
# add unit tests
|
||||||
#############################################################################
|
#############################################################################
|
||||||
|
|
||||||
# Generate the leak checks for every JSON_HEDLEY_* macro defined in
|
|
||||||
# hedley.hpp; tests/src/unit-no-macro-leak.cpp #include-s the result after
|
|
||||||
# nlohmann/json.hpp (see issue #5408). Using the shared
|
|
||||||
# cmake/scripts/gen_hedley_undef_check.cmake script (also used by `make
|
|
||||||
# update_hedley_undef`) instead of a hand-maintained list of macro names
|
|
||||||
# means this test can never go stale after a future `make update_hedley`.
|
|
||||||
set(hedley_hpp "${PROJECT_SOURCE_DIR}/include/nlohmann/thirdparty/hedley/hedley.hpp")
|
|
||||||
set(hedley_undef_check_script "${PROJECT_SOURCE_DIR}/cmake/scripts/gen_hedley_undef_check.cmake")
|
|
||||||
set(hedley_undef_checks "${PROJECT_BINARY_DIR}/include/hedley_undef_checks.inc")
|
|
||||||
|
|
||||||
# Reconfigure whenever the vendored header or the generator script changes,
|
|
||||||
# so a `cmake --build` after `make update_hedley` does not silently keep a
|
|
||||||
# stale generated file around.
|
|
||||||
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
|
|
||||||
"${hedley_hpp}"
|
|
||||||
"${hedley_undef_check_script}")
|
|
||||||
|
|
||||||
# Generate once at configure time, so the very first build (before any
|
|
||||||
# custom-command build step has run) already has an up-to-date file.
|
|
||||||
execute_process(
|
|
||||||
COMMAND ${CMAKE_COMMAND}
|
|
||||||
"-DHEDLEY_HPP=${hedley_hpp}"
|
|
||||||
"-DOUTPUT=${hedley_undef_checks}"
|
|
||||||
-DMODE=checks
|
|
||||||
-P "${hedley_undef_check_script}"
|
|
||||||
RESULT_VARIABLE hedley_undef_check_result
|
|
||||||
)
|
|
||||||
if(NOT hedley_undef_check_result EQUAL 0)
|
|
||||||
message(FATAL_ERROR "Failed to generate ${hedley_undef_checks}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Also (re)generate as a build step, so an incremental build after editing
|
|
||||||
# hedley.hpp without a full reconfigure still picks up the change.
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${hedley_undef_checks}"
|
|
||||||
COMMAND ${CMAKE_COMMAND}
|
|
||||||
"-DHEDLEY_HPP=${hedley_hpp}"
|
|
||||||
"-DOUTPUT=${hedley_undef_checks}"
|
|
||||||
-DMODE=checks
|
|
||||||
-P "${hedley_undef_check_script}"
|
|
||||||
DEPENDS "${hedley_hpp}" "${hedley_undef_check_script}"
|
|
||||||
COMMENT "Generating Hedley undef leak checks"
|
|
||||||
VERBATIM)
|
|
||||||
add_custom_target(generate_hedley_undef_checks DEPENDS "${hedley_undef_checks}")
|
|
||||||
|
|
||||||
if("${JSON_TestStandards}" STREQUAL "")
|
if("${JSON_TestStandards}" STREQUAL "")
|
||||||
set(test_cxx_standards 11 14 17 20 23)
|
set(test_cxx_standards 11 14 17 20 23)
|
||||||
unset(test_force)
|
unset(test_force)
|
||||||
@@ -208,14 +163,6 @@ foreach(file ${files})
|
|||||||
json_test_add_test_for(${file} MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force})
|
json_test_add_test_for(${file} MAIN test_main CXX_STANDARDS ${test_cxx_standards} ${test_force})
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# tests/src/unit-no-macro-leak.cpp #include-s the generated leak-check file,
|
|
||||||
# so its test targets must be built after generate_hedley_undef_checks.
|
|
||||||
foreach(cxx_standard ${test_cxx_standards})
|
|
||||||
if(TARGET test-no-macro-leak_cpp${cxx_standard})
|
|
||||||
add_dependencies(test-no-macro-leak_cpp${cxx_standard} generate_hedley_undef_checks)
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
if(json_32bit_test_only)
|
if(json_32bit_test_only)
|
||||||
# Skip all other tests in this file
|
# Skip all other tests in this file
|
||||||
return()
|
return()
|
||||||
|
|||||||
@@ -1389,6 +1389,61 @@ TEST_CASE("JSON patch - add to a primitive parent (regression #4292)")
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_CASE("JSON patch - remove with primitive or null parent (regression #5396)")
|
||||||
|
{
|
||||||
|
// Regression test for https://github.com/nlohmann/json/issues/5396
|
||||||
|
//
|
||||||
|
// RFC 6902 (§4.2) requires the target location of a "remove" operation
|
||||||
|
// to exist. When the target's parent resolves to a primitive value or
|
||||||
|
// null, the operation must fail. Previously operation_remove silently
|
||||||
|
// did nothing in this case (neither the "is_object" nor the "is_array"
|
||||||
|
// branch matched, and there was no final "else"), so the patch appeared
|
||||||
|
// to succeed without changing the document. It now throws
|
||||||
|
// out_of_range.413.
|
||||||
|
|
||||||
|
SECTION("parent is a primitive (number)")
|
||||||
|
{
|
||||||
|
json const doc = {{"a", 1}};
|
||||||
|
json const patch = {{{"op", "remove"}, {"path", "/a/b"}}};
|
||||||
|
#if JSON_DIAGNOSTICS
|
||||||
|
CHECK_THROWS_WITH_AS(doc.patch(patch), "[json.exception.out_of_range.413] (/a) cannot remove value: the JSON Patch 'remove' target's parent is of type number, but must be an object or array", json::out_of_range&);
|
||||||
|
#else
|
||||||
|
CHECK_THROWS_WITH_AS(doc.patch(patch), "[json.exception.out_of_range.413] cannot remove value: the JSON Patch 'remove' target's parent is of type number, but must be an object or array", json::out_of_range&);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
SECTION("parent is a primitive (string)")
|
||||||
|
{
|
||||||
|
json const doc = {{"foo", {{"bar", "a string"}}}};
|
||||||
|
json const patch = {{{"op", "remove"}, {"path", "/foo/bar/baz"}}};
|
||||||
|
#if JSON_DIAGNOSTICS
|
||||||
|
CHECK_THROWS_WITH_AS(doc.patch(patch), "[json.exception.out_of_range.413] (/foo/bar) cannot remove value: the JSON Patch 'remove' target's parent is of type string, but must be an object or array", json::out_of_range&);
|
||||||
|
#else
|
||||||
|
CHECK_THROWS_WITH_AS(doc.patch(patch), "[json.exception.out_of_range.413] cannot remove value: the JSON Patch 'remove' target's parent is of type string, but must be an object or array", json::out_of_range&);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
SECTION("top-level document is null")
|
||||||
|
{
|
||||||
|
json const doc = nullptr;
|
||||||
|
json const patch = {{{"op", "remove"}, {"path", "/a"}}};
|
||||||
|
CHECK_THROWS_WITH_AS(doc.patch(patch), "[json.exception.out_of_range.413] cannot remove value: the JSON Patch 'remove' target's parent is of type null, but must be an object or array", json::out_of_range&);
|
||||||
|
}
|
||||||
|
|
||||||
|
SECTION("legitimate removes still work")
|
||||||
|
{
|
||||||
|
// object member
|
||||||
|
json const doc1 = {{"a", 1}, {"b", 2}};
|
||||||
|
json const patch1 = {{{"op", "remove"}, {"path", "/a"}}};
|
||||||
|
CHECK(doc1.patch(patch1) == json({{"b", 2}}));
|
||||||
|
|
||||||
|
// array element
|
||||||
|
json const doc2 = R"([1, 2, 3])"_json;
|
||||||
|
json const patch2 = {{{"op", "remove"}, {"path", "/1"}}};
|
||||||
|
CHECK(doc2.patch(patch2) == R"([1, 3])"_json);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
TEST_CASE("JSON patch - diff emits array removals in descending index order")
|
TEST_CASE("JSON patch - diff emits array removals in descending index order")
|
||||||
{
|
{
|
||||||
SECTION("array shrunk to empty")
|
SECTION("array shrunk to empty")
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
// __ _____ _____ _____
|
|
||||||
// __| | __| | | | 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.
|
|
||||||
//
|
|
||||||
// hedley_undef_checks.inc (included below) is generated at CMake configure/
|
|
||||||
// build time by cmake/scripts/gen_hedley_undef_check.cmake, which derives the
|
|
||||||
// full list of JSON_HEDLEY_* macro names directly from hedley.hpp. That way
|
|
||||||
// this test covers every macro Hedley actually defines -- not a hardcoded
|
|
||||||
// snapshot that would silently go stale the next time `make update_hedley`
|
|
||||||
// runs -- and can never drift from the vendored header.
|
|
||||||
|
|
||||||
#include "doctest_compatibility.h"
|
|
||||||
|
|
||||||
#include <nlohmann/json.hpp>
|
|
||||||
|
|
||||||
TEST_CASE("JSON_HEDLEY macros do not leak after including json.hpp")
|
|
||||||
{
|
|
||||||
#include "hedley_undef_checks.inc"
|
|
||||||
CHECK(true); // keep an assertion when nothing leaked
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user