Skip to content

J
json
Unverified Commit b6d0a4ab by Niels Lohmann
Options

Merge branch 'develop' of https://github.com/nlohmann/json into issue2228

parents 2c231f95 75d5d059
Showing with 236 additions and 140 deletions
CMakeLists.txt
...@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1) ...@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
## PROJECT ## PROJECT
## name and version ## name and version
## ##
project(nlohmann_json VERSION 3.8.0 LANGUAGES CXX) project(nlohmann_json VERSION 3.8.0 DESCRIPTION "JSON for Modern C++" LANGUAGES CXX)
## ##
## INCLUDE ## INCLUDE
...@@ -79,6 +79,12 @@ if (MSVC) ...@@ -79,6 +79,12 @@ if (MSVC)
) )
endif() endif()
# Install a pkg-config file, so other tools can find this.
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkg-config.pc.in"
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
)
## ##
## TESTS ## TESTS
## create and configure the unit test target ## create and configure the unit test target
...@@ -139,4 +145,8 @@ endif() ...@@ -139,4 +145,8 @@ endif()
NAMESPACE ${PROJECT_NAME}:: NAMESPACE ${PROJECT_NAME}::
DESTINATION ${NLOHMANN_JSON_CONFIG_INSTALL_DIR} DESTINATION ${NLOHMANN_JSON_CONFIG_INSTALL_DIR}
) )
install(
FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
DESTINATION lib/pkgconfig
)
endif() endif()
Makefile
...@@ -97,6 +97,7 @@ doctest: ...@@ -97,6 +97,7 @@ doctest:
# -Wno-exit-time-destructors: warning in json code triggered by NLOHMANN_JSON_SERIALIZE_ENUM # -Wno-exit-time-destructors: warning in json code triggered by NLOHMANN_JSON_SERIALIZE_ENUM
# -Wno-float-equal: not all comparisons in the tests can be replaced by Approx # -Wno-float-equal: not all comparisons in the tests can be replaced by Approx
# -Wno-keyword-macro: unit-tests use "#define private public" # -Wno-keyword-macro: unit-tests use "#define private public"
# -Wno-missing-prototypes: for NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
# -Wno-padded: padding is nothing to warn about # -Wno-padded: padding is nothing to warn about
# -Wno-range-loop-analysis: items tests "for(const auto i...)" # -Wno-range-loop-analysis: items tests "for(const auto i...)"
# -Wno-switch-enum -Wno-covered-switch-default: pedantic/contradicting warnings about switches # -Wno-switch-enum -Wno-covered-switch-default: pedantic/contradicting warnings about switches
...@@ -113,6 +114,7 @@ pedantic_clang: ...@@ -113,6 +114,7 @@ pedantic_clang:
-Wno-exit-time-destructors \ -Wno-exit-time-destructors \
-Wno-float-equal \ -Wno-float-equal \
-Wno-keyword-macro \ -Wno-keyword-macro \
-Wno-missing-prototypes \
-Wno-padded \ -Wno-padded \
-Wno-range-loop-analysis \ -Wno-range-loop-analysis \
-Wno-switch-enum -Wno-covered-switch-default \ -Wno-switch-enum -Wno-covered-switch-default \
......
README.md
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
- [Integration](#integration) - [Integration](#integration)
- [CMake](#cmake) - [CMake](#cmake)
- [Package Managers](#package-managers) - [Package Managers](#package-managers)
- [Pkg-config](#pkg-config)
- [Examples](#examples) - [Examples](#examples)
- [JSON as first-class data type](#json-as-first-class-data-type) - [JSON as first-class data type](#json-as-first-class-data-type)
- [Serialization / Deserialization](#serialization--deserialization) - [Serialization / Deserialization](#serialization--deserialization)
...@@ -230,6 +231,20 @@ Please file issues [here](https://github.com/build2-packaging/nlohmann-json) if ...@@ -230,6 +231,20 @@ Please file issues [here](https://github.com/build2-packaging/nlohmann-json) if
If you are using [`wsjcpp`](https://wsjcpp.org), you can use the command `wsjcpp install "https://github.com/nlohmann/json:develop"` to get the latest version. Note you can change the branch ":develop" to an existing tag or another branch. If you are using [`wsjcpp`](https://wsjcpp.org), you can use the command `wsjcpp install "https://github.com/nlohmann/json:develop"` to get the latest version. Note you can change the branch ":develop" to an existing tag or another branch.
### Pkg-config
If you are using bare Makefiles, you can use `pkg-config` to generate the include flags that point to where the library is installed:
```sh
pkg-config nlohmann_json --cflags
```
Users of the Meson build system will also be able to use a system wide library, which will be found by `pkg-config`:
```meson
json = dependency('nlohmann_json', required: true)
```
## Examples ## Examples
Beside the examples below, you may want to check the [documentation](https://nlohmann.github.io/json/) where each function contains a separate code example (e.g., check out [`emplace()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5338e282d1d02bed389d852dd670d98d.html#a5338e282d1d02bed389d852dd670d98d)). All [example files](https://github.com/nlohmann/json/tree/develop/doc/examples) can be compiled and executed on their own (e.g., file [emplace.cpp](https://github.com/nlohmann/json/blob/develop/doc/examples/emplace.cpp)). Beside the examples below, you may want to check the [documentation](https://nlohmann.github.io/json/) where each function contains a separate code example (e.g., check out [`emplace()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5338e282d1d02bed389d852dd670d98d.html#a5338e282d1d02bed389d852dd670d98d)). All [example files](https://github.com/nlohmann/json/tree/develop/doc/examples) can be compiled and executed on their own (e.g., file [emplace.cpp](https://github.com/nlohmann/json/blob/develop/doc/examples/emplace.cpp)).
...@@ -1572,7 +1587,7 @@ Here is a related issue [#1924](https://github.com/nlohmann/json/issues/1924). ...@@ -1572,7 +1587,7 @@ Here is a related issue [#1924](https://github.com/nlohmann/json/issues/1924).
### Further notes ### Further notes
- The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](https://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a233b02b0839ef798942dd46157cc0fe6.html#a233b02b0839ef798942dd46157cc0fe6) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a73ae333487310e3302135189ce8ff5d8.html#a73ae333487310e3302135189ce8ff5d8). - The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](https://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a233b02b0839ef798942dd46157cc0fe6.html#a233b02b0839ef798942dd46157cc0fe6) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a73ae333487310e3302135189ce8ff5d8.html#a73ae333487310e3302135189ce8ff5d8). Furthermore, you can define `JSON_ASSERT(x)` to replace calls to `assert(x)`.
- As the exact type of a number is not defined in the [JSON specification](https://tools.ietf.org/html/rfc8259.html), this library tries to choose the best fitting C++ number type automatically. As a result, the type `double` may be used to store numbers which may yield [**floating-point exceptions**](https://github.com/nlohmann/json/issues/181) in certain rare situations if floating-point exceptions have been unmasked in the calling code. These exceptions are not caused by the library and need to be fixed in the calling code, such as by re-masking the exceptions prior to calling library functions. - As the exact type of a number is not defined in the [JSON specification](https://tools.ietf.org/html/rfc8259.html), this library tries to choose the best fitting C++ number type automatically. As a result, the type `double` may be used to store numbers which may yield [**floating-point exceptions**](https://github.com/nlohmann/json/issues/181) in certain rare situations if floating-point exceptions have been unmasked in the calling code. These exceptions are not caused by the library and need to be fixed in the calling code, such as by re-masking the exceptions prior to calling library functions.
- The code can be compiled without C++ **runtime type identification** features; that is, you can use the `-fno-rtti` compiler flag. - The code can be compiled without C++ **runtime type identification** features; that is, you can use the `-fno-rtti` compiler flag.
- **Exceptions** are used widely within the library. They can, however, be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION`. In this case, exceptions are replaced by `abort()` calls. You can further control this behavior by defining `JSON_THROW_USER´` (overriding `throw`), `JSON_TRY_USER` (overriding `try`), and `JSON_CATCH_USER` (overriding `catch`). Note that `JSON_THROW_USER` should leave the current scope (e.g., by throwing or aborting), as continuing after it may yield undefined behavior. - **Exceptions** are used widely within the library. They can, however, be switched off with either using the compiler flag `-fno-exceptions` or by defining the symbol `JSON_NOEXCEPTION`. In this case, exceptions are replaced by `abort()` calls. You can further control this behavior by defining `JSON_THROW_USER´` (overriding `throw`), `JSON_TRY_USER` (overriding `try`), and `JSON_CATCH_USER` (overriding `catch`). Note that `JSON_THROW_USER` should leave the current scope (e.g., by throwing or aborting), as continuing after it may yield undefined behavior.
......
cmake/pkg-config.pc.in 0 → 100644
Name: ${PROJECT_NAME}
Description: ${PROJECT_DESCRIPTION}
Version: ${PROJECT_VERSION}
Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
include/nlohmann/detail/conversions/to_chars.hpp
#pragma once #pragma once
#include <array> // array #include <array> // array
#include <cassert> // assert
#include <cmath> // signbit, isfinite #include <cmath> // signbit, isfinite
#include <cstdint> // intN_t, uintN_t #include <cstdint> // intN_t, uintN_t
#include <cstring> // memcpy, memmove #include <cstring> // memcpy, memmove
...@@ -63,8 +62,8 @@ struct diyfp // f * 2^e ...@@ -63,8 +62,8 @@ struct diyfp // f * 2^e
*/ */
static diyfp sub(const diyfp& x, const diyfp& y) noexcept static diyfp sub(const diyfp& x, const diyfp& y) noexcept
{ {
assert(x.e == y.e); JSON_ASSERT(x.e == y.e);
assert(x.f >= y.f); JSON_ASSERT(x.f >= y.f);
return {x.f - y.f, x.e}; return {x.f - y.f, x.e};
} }
...@@ -140,7 +139,7 @@ struct diyfp // f * 2^e ...@@ -140,7 +139,7 @@ struct diyfp // f * 2^e
*/ */
static diyfp normalize(diyfp x) noexcept static diyfp normalize(diyfp x) noexcept
{ {
assert(x.f != 0); JSON_ASSERT(x.f != 0);
while ((x.f >> 63u) == 0) while ((x.f >> 63u) == 0)
{ {
...@@ -159,8 +158,8 @@ struct diyfp // f * 2^e ...@@ -159,8 +158,8 @@ struct diyfp // f * 2^e
{ {
const int delta = x.e - target_exponent; const int delta = x.e - target_exponent;
assert(delta >= 0); JSON_ASSERT(delta >= 0);
assert(((x.f << delta) >> delta) == x.f); JSON_ASSERT(((x.f << delta) >> delta) == x.f);
return {x.f << delta, target_exponent}; return {x.f << delta, target_exponent};
} }
...@@ -182,8 +181,8 @@ boundaries. ...@@ -182,8 +181,8 @@ boundaries.
template <typename FloatType> template <typename FloatType>
boundaries compute_boundaries(FloatType value) boundaries compute_boundaries(FloatType value)
{ {
assert(std::isfinite(value)); JSON_ASSERT(std::isfinite(value));
assert(value > 0); JSON_ASSERT(value > 0);
// Convert the IEEE representation into a diyfp. // Convert the IEEE representation into a diyfp.
// //
...@@ -463,18 +462,18 @@ inline cached_power get_cached_power_for_binary_exponent(int e) ...@@ -463,18 +462,18 @@ inline cached_power get_cached_power_for_binary_exponent(int e)
// k = ceil((kAlpha - e - 1) * 0.30102999566398114) // k = ceil((kAlpha - e - 1) * 0.30102999566398114)
// for |e| <= 1500, but doesn't require floating-point operations. // for |e| <= 1500, but doesn't require floating-point operations.
// NB: log_10(2) ~= 78913 / 2^18 // NB: log_10(2) ~= 78913 / 2^18
assert(e >= -1500); JSON_ASSERT(e >= -1500);
assert(e <= 1500); JSON_ASSERT(e <= 1500);
const int f = kAlpha - e - 1; const int f = kAlpha - e - 1;
const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0); const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep; const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
assert(index >= 0); JSON_ASSERT(index >= 0);
assert(static_cast<std::size_t>(index) < kCachedPowers.size()); JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)]; const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
assert(kAlpha <= cached.e + e + 64); JSON_ASSERT(kAlpha <= cached.e + e + 64);
assert(kGamma >= cached.e + e + 64); JSON_ASSERT(kGamma >= cached.e + e + 64);
return cached; return cached;
} }
...@@ -542,10 +541,10 @@ inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10) ...@@ -542,10 +541,10 @@ inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta, inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
std::uint64_t rest, std::uint64_t ten_k) std::uint64_t rest, std::uint64_t ten_k)
{ {
assert(len >= 1); JSON_ASSERT(len >= 1);
assert(dist <= delta); JSON_ASSERT(dist <= delta);
assert(rest <= delta); JSON_ASSERT(rest <= delta);
assert(ten_k > 0); JSON_ASSERT(ten_k > 0);
// <--------------------------- delta ----> // <--------------------------- delta ---->
// <---- dist ---------> // <---- dist --------->
...@@ -570,7 +569,7 @@ inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t d ...@@ -570,7 +569,7 @@ inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t d
and delta - rest >= ten_k and delta - rest >= ten_k
and (rest + ten_k < dist or dist - rest > rest + ten_k - dist)) and (rest + ten_k < dist or dist - rest > rest + ten_k - dist))
{ {
assert(buf[len - 1] != '0'); JSON_ASSERT(buf[len - 1] != '0');
buf[len - 1]--; buf[len - 1]--;
rest += ten_k; rest += ten_k;
} }
...@@ -598,8 +597,8 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, ...@@ -598,8 +597,8 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
// Grisu2 generates the digits of M+ from left to right and stops as soon as // Grisu2 generates the digits of M+ from left to right and stops as soon as
// V is in [M-,M+]. // V is in [M-,M+].
assert(M_plus.e >= kAlpha); JSON_ASSERT(M_plus.e >= kAlpha);
assert(M_plus.e <= kGamma); JSON_ASSERT(M_plus.e <= kGamma);
std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e) std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
std::uint64_t dist = diyfp::sub(M_plus, w ).f; // (significand of (M+ - w ), implicit exponent is e) std::uint64_t dist = diyfp::sub(M_plus, w ).f; // (significand of (M+ - w ), implicit exponent is e)
...@@ -620,7 +619,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, ...@@ -620,7 +619,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
// //
// Generate the digits of the integral part p1 = d[n-1]...d[1]d[0] // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
assert(p1 > 0); JSON_ASSERT(p1 > 0);
std::uint32_t pow10; std::uint32_t pow10;
const int k = find_largest_pow10(p1, pow10); const int k = find_largest_pow10(p1, pow10);
...@@ -656,7 +655,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, ...@@ -656,7 +655,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
// M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e // M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
// = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e) // = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
// //
assert(d <= 9); JSON_ASSERT(d <= 9);
buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
// //
// M+ = buffer * 10^(n-1) + (r + p2 * 2^e) // M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
...@@ -743,7 +742,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, ...@@ -743,7 +742,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
// //
// and stop as soon as 10^-m * r * 2^e <= delta * 2^e // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
assert(p2 > delta); JSON_ASSERT(p2 > delta);
int m = 0; int m = 0;
for (;;) for (;;)
...@@ -754,7 +753,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, ...@@ -754,7 +753,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
// = buffer * 10^-m + 10^-m * (1/10 * (10 * p2) ) * 2^e // = buffer * 10^-m + 10^-m * (1/10 * (10 * p2) ) * 2^e
// = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e // = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
// //
assert(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10); JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
p2 *= 10; p2 *= 10;
const std::uint64_t d = p2 >> -one.e; // d = (10 * p2) div 2^-e const std::uint64_t d = p2 >> -one.e; // d = (10 * p2) div 2^-e
const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
...@@ -763,7 +762,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, ...@@ -763,7 +762,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
// = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e)) // = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
// = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e // = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
// //
assert(d <= 9); JSON_ASSERT(d <= 9);
buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
// //
// M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e // M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
...@@ -824,8 +823,8 @@ JSON_HEDLEY_NON_NULL(1) ...@@ -824,8 +823,8 @@ JSON_HEDLEY_NON_NULL(1)
inline void grisu2(char* buf, int& len, int& decimal_exponent, inline void grisu2(char* buf, int& len, int& decimal_exponent,
diyfp m_minus, diyfp v, diyfp m_plus) diyfp m_minus, diyfp v, diyfp m_plus)
{ {
assert(m_plus.e == m_minus.e); JSON_ASSERT(m_plus.e == m_minus.e);
assert(m_plus.e == v.e); JSON_ASSERT(m_plus.e == v.e);
// --------(-----------------------+-----------------------)-------- (A) // --------(-----------------------+-----------------------)-------- (A)
// m- v m+ // m- v m+
...@@ -886,8 +885,8 @@ void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value) ...@@ -886,8 +885,8 @@ void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3, static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
"internal error: not enough precision"); "internal error: not enough precision");
assert(std::isfinite(value)); JSON_ASSERT(std::isfinite(value));
assert(value > 0); JSON_ASSERT(value > 0);
// If the neighbors (and boundaries) of 'value' are always computed for double-precision // If the neighbors (and boundaries) of 'value' are always computed for double-precision
// numbers, all float's can be recovered using strtod (and strtof). However, the resulting // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
...@@ -923,8 +922,8 @@ JSON_HEDLEY_NON_NULL(1) ...@@ -923,8 +922,8 @@ JSON_HEDLEY_NON_NULL(1)
JSON_HEDLEY_RETURNS_NON_NULL JSON_HEDLEY_RETURNS_NON_NULL
inline char* append_exponent(char* buf, int e) inline char* append_exponent(char* buf, int e)
{ {
assert(e > -1000); JSON_ASSERT(e > -1000);
assert(e < 1000); JSON_ASSERT(e < 1000);
if (e < 0) if (e < 0)
{ {
...@@ -976,8 +975,8 @@ JSON_HEDLEY_RETURNS_NON_NULL ...@@ -976,8 +975,8 @@ JSON_HEDLEY_RETURNS_NON_NULL
inline char* format_buffer(char* buf, int len, int decimal_exponent, inline char* format_buffer(char* buf, int len, int decimal_exponent,
int min_exp, int max_exp) int min_exp, int max_exp)
{ {
assert(min_exp < 0); JSON_ASSERT(min_exp < 0);
assert(max_exp > 0); JSON_ASSERT(max_exp > 0);
const int k = len; const int k = len;
const int n = len + decimal_exponent; const int n = len + decimal_exponent;
...@@ -1003,7 +1002,7 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent, ...@@ -1003,7 +1002,7 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
// dig.its // dig.its
// len <= max_digits10 + 1 // len <= max_digits10 + 1
assert(k > n); JSON_ASSERT(k > n);
std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n)); std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
buf[n] = '.'; buf[n] = '.';
...@@ -1061,7 +1060,7 @@ JSON_HEDLEY_RETURNS_NON_NULL ...@@ -1061,7 +1060,7 @@ JSON_HEDLEY_RETURNS_NON_NULL
char* to_chars(char* first, const char* last, FloatType value) char* to_chars(char* first, const char* last, FloatType value)
{ {
static_cast<void>(last); // maybe unused - fix warning static_cast<void>(last); // maybe unused - fix warning
assert(std::isfinite(value)); JSON_ASSERT(std::isfinite(value));
// Use signbit(value) instead of (value < 0) since signbit works for -0. // Use signbit(value) instead of (value < 0) since signbit works for -0.
if (std::signbit(value)) if (std::signbit(value))
...@@ -1079,7 +1078,7 @@ char* to_chars(char* first, const char* last, FloatType value) ...@@ -1079,7 +1078,7 @@ char* to_chars(char* first, const char* last, FloatType value)
return first; return first;
} }
assert(last - first >= std::numeric_limits<FloatType>::max_digits10); JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
// Compute v = buffer * 10^decimal_exponent. // Compute v = buffer * 10^decimal_exponent.
// The decimal digits are stored in the buffer, which needs to be interpreted // The decimal digits are stored in the buffer, which needs to be interpreted
...@@ -1089,16 +1088,16 @@ char* to_chars(char* first, const char* last, FloatType value) ...@@ -1089,16 +1088,16 @@ char* to_chars(char* first, const char* last, FloatType value)
int decimal_exponent = 0; int decimal_exponent = 0;
dtoa_impl::grisu2(first, len, decimal_exponent, value); dtoa_impl::grisu2(first, len, decimal_exponent, value);
assert(len <= std::numeric_limits<FloatType>::max_digits10); JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
// Format the buffer like printf("%.*g", prec, value) // Format the buffer like printf("%.*g", prec, value)
constexpr int kMinExp = -4; constexpr int kMinExp = -4;
// Use digits10 here to increase compatibility with version 2. // Use digits10 here to increase compatibility with version 2.
constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10; constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
assert(last - first >= kMaxExp + 2); JSON_ASSERT(last - first >= kMaxExp + 2);
assert(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10); JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
assert(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6); JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp); return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
} }
......
include/nlohmann/detail/input/binary_reader.hpp
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#include <algorithm> // generate_n #include <algorithm> // generate_n
#include <array> // array #include <array> // array
#include <cassert> // assert
#include <cmath> // ldexp #include <cmath> // ldexp
#include <cstddef> // size_t #include <cstddef> // size_t
#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t #include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
...@@ -109,7 +108,7 @@ class binary_reader ...@@ -109,7 +108,7 @@ class binary_reader
break; break;
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
} }
// strict mode: next byte must be EOF // strict mode: next byte must be EOF
...@@ -717,8 +716,8 @@ class binary_reader ...@@ -717,8 +716,8 @@ class binary_reader
{ {
const int exp = (half >> 10u) & 0x1Fu; const int exp = (half >> 10u) & 0x1Fu;
const unsigned int mant = half & 0x3FFu; const unsigned int mant = half & 0x3FFu;
assert(0 <= exp and exp <= 32); JSON_ASSERT(0 <= exp and exp <= 32);
assert(mant <= 1024); JSON_ASSERT(mant <= 1024);
switch (exp) switch (exp)
{ {
case 0: case 0:
...@@ -2295,7 +2294,7 @@ class binary_reader ...@@ -2295,7 +2294,7 @@ class binary_reader
break; break;
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
} }
return error_msg + " " + context + ": " + detail; return error_msg + " " + context + ": " + detail;
......
include/nlohmann/detail/input/input_adapters.hpp
#pragma once #pragma once
#include <array> // array #include <array> // array
#include <cassert> // assert
#include <cstddef> // size_t #include <cstddef> // size_t
#include <cstdio> //FILE * #include <cstdio> //FILE *
#include <cstring> // strlen #include <cstring> // strlen
...@@ -297,13 +296,13 @@ class wide_string_input_adapter ...@@ -297,13 +296,13 @@ class wide_string_input_adapter
{ {
fill_buffer<sizeof(WideCharType)>(); fill_buffer<sizeof(WideCharType)>();
assert(utf8_bytes_filled > 0); JSON_ASSERT(utf8_bytes_filled > 0);
assert(utf8_bytes_index == 0); JSON_ASSERT(utf8_bytes_index == 0);
} }
// use buffer // use buffer
assert(utf8_bytes_filled > 0); JSON_ASSERT(utf8_bytes_filled > 0);
assert(utf8_bytes_index < utf8_bytes_filled); JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
return utf8_bytes[utf8_bytes_index++]; return utf8_bytes[utf8_bytes_index++];
} }
......
include/nlohmann/detail/input/json_sax.hpp
#pragma once #pragma once
#include <cassert> // assert
#include <cstddef> #include <cstddef>
#include <string> // string #include <string> // string
#include <utility> // move #include <utility> // move
...@@ -280,7 +279,7 @@ class json_sax_dom_parser ...@@ -280,7 +279,7 @@ class json_sax_dom_parser
case 5: case 5:
JSON_THROW(*dynamic_cast<const detail::other_error*>(&ex)); JSON_THROW(*dynamic_cast<const detail::other_error*>(&ex));
default: default:
assert(false); JSON_ASSERT(false);
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
} }
} }
...@@ -309,7 +308,7 @@ class json_sax_dom_parser ...@@ -309,7 +308,7 @@ class json_sax_dom_parser
return &root; return &root;
} }
assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); JSON_ASSERT(ref_stack.back()->is_array() or ref_stack.back()->is_object());
if (ref_stack.back()->is_array()) if (ref_stack.back()->is_array())
{ {
...@@ -317,8 +316,8 @@ class json_sax_dom_parser ...@@ -317,8 +316,8 @@ class json_sax_dom_parser
return &(ref_stack.back()->m_value.array->back()); return &(ref_stack.back()->m_value.array->back());
} }
assert(ref_stack.back()->is_object()); JSON_ASSERT(ref_stack.back()->is_object());
assert(object_element); JSON_ASSERT(object_element);
*object_element = BasicJsonType(std::forward<Value>(v)); *object_element = BasicJsonType(std::forward<Value>(v));
return object_element; return object_element;
} }
...@@ -447,8 +446,8 @@ class json_sax_dom_callback_parser ...@@ -447,8 +446,8 @@ class json_sax_dom_callback_parser
*ref_stack.back() = discarded; *ref_stack.back() = discarded;
} }
assert(not ref_stack.empty()); JSON_ASSERT(not ref_stack.empty());
assert(not keep_stack.empty()); JSON_ASSERT(not keep_stack.empty());
ref_stack.pop_back(); ref_stack.pop_back();
keep_stack.pop_back(); keep_stack.pop_back();
...@@ -499,8 +498,8 @@ class json_sax_dom_callback_parser ...@@ -499,8 +498,8 @@ class json_sax_dom_callback_parser
} }
} }
assert(not ref_stack.empty()); JSON_ASSERT(not ref_stack.empty());
assert(not keep_stack.empty()); JSON_ASSERT(not keep_stack.empty());
ref_stack.pop_back(); ref_stack.pop_back();
keep_stack.pop_back(); keep_stack.pop_back();
...@@ -534,7 +533,7 @@ class json_sax_dom_callback_parser ...@@ -534,7 +533,7 @@ class json_sax_dom_callback_parser
case 5: case 5:
JSON_THROW(*dynamic_cast<const detail::other_error*>(&ex)); JSON_THROW(*dynamic_cast<const detail::other_error*>(&ex));
default: default:
assert(false); JSON_ASSERT(false);
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
} }
} }
...@@ -565,7 +564,7 @@ class json_sax_dom_callback_parser ...@@ -565,7 +564,7 @@ class json_sax_dom_callback_parser
template<typename Value> template<typename Value>
std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false) std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
{ {
assert(not keep_stack.empty()); JSON_ASSERT(not keep_stack.empty());
// do not handle this value if we know it would be added to a discarded // do not handle this value if we know it would be added to a discarded
// container // container
...@@ -600,7 +599,7 @@ class json_sax_dom_callback_parser ...@@ -600,7 +599,7 @@ class json_sax_dom_callback_parser
} }
// we now only expect arrays and objects // we now only expect arrays and objects
assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); JSON_ASSERT(ref_stack.back()->is_array() or ref_stack.back()->is_object());
// array // array
if (ref_stack.back()->is_array()) if (ref_stack.back()->is_array())
...@@ -610,9 +609,9 @@ class json_sax_dom_callback_parser ...@@ -610,9 +609,9 @@ class json_sax_dom_callback_parser
} }
// object // object
assert(ref_stack.back()->is_object()); JSON_ASSERT(ref_stack.back()->is_object());
// check if we should store an element for the current key // check if we should store an element for the current key
assert(not key_keep_stack.empty()); JSON_ASSERT(not key_keep_stack.empty());
const bool store_element = key_keep_stack.back(); const bool store_element = key_keep_stack.back();
key_keep_stack.pop_back(); key_keep_stack.pop_back();
...@@ -621,7 +620,7 @@ class json_sax_dom_callback_parser ...@@ -621,7 +620,7 @@ class json_sax_dom_callback_parser
return {false, nullptr}; return {false, nullptr};
} }
assert(object_element); JSON_ASSERT(object_element);
*object_element = std::move(value); *object_element = std::move(value);
return {true, object_element}; return {true, object_element};
} }
......
include/nlohmann/detail/input/lexer.hpp
...@@ -135,7 +135,7 @@ class lexer : public lexer_base<BasicJsonType> ...@@ -135,7 +135,7 @@ class lexer : public lexer_base<BasicJsonType>
static char get_decimal_point() noexcept static char get_decimal_point() noexcept
{ {
const auto* loc = localeconv(); const auto* loc = localeconv();
assert(loc != nullptr); JSON_ASSERT(loc != nullptr);
return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point); return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
} }
...@@ -161,7 +161,7 @@ class lexer : public lexer_base<BasicJsonType> ...@@ -161,7 +161,7 @@ class lexer : public lexer_base<BasicJsonType>
int get_codepoint() int get_codepoint()
{ {
// this function only makes sense after reading `\u` // this function only makes sense after reading `\u`
assert(current == 'u'); JSON_ASSERT(current == 'u');
int codepoint = 0; int codepoint = 0;
const auto factors = { 12u, 8u, 4u, 0u }; const auto factors = { 12u, 8u, 4u, 0u };
...@@ -187,7 +187,7 @@ class lexer : public lexer_base<BasicJsonType> ...@@ -187,7 +187,7 @@ class lexer : public lexer_base<BasicJsonType>
} }
} }
assert(0x0000 <= codepoint and codepoint <= 0xFFFF); JSON_ASSERT(0x0000 <= codepoint and codepoint <= 0xFFFF);
return codepoint; return codepoint;
} }
...@@ -208,7 +208,7 @@ class lexer : public lexer_base<BasicJsonType> ...@@ -208,7 +208,7 @@ class lexer : public lexer_base<BasicJsonType>
*/ */
bool next_byte_in_range(std::initializer_list<char_int_type> ranges) bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
{ {
assert(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6); JSON_ASSERT(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6);
add(current); add(current);
for (auto range = ranges.begin(); range != ranges.end(); ++range) for (auto range = ranges.begin(); range != ranges.end(); ++range)
...@@ -249,7 +249,7 @@ class lexer : public lexer_base<BasicJsonType> ...@@ -249,7 +249,7 @@ class lexer : public lexer_base<BasicJsonType>
reset(); reset();
// we entered the function by reading an open quote // we entered the function by reading an open quote
assert(current == '\"'); JSON_ASSERT(current == '\"');
while (true) while (true)
{ {
...@@ -369,7 +369,7 @@ class lexer : public lexer_base<BasicJsonType> ...@@ -369,7 +369,7 @@ class lexer : public lexer_base<BasicJsonType>
} }
// result of the above calculation yields a proper codepoint // result of the above calculation yields a proper codepoint
assert(0x00 <= codepoint and codepoint <= 0x10FFFF); JSON_ASSERT(0x00 <= codepoint and codepoint <= 0x10FFFF);
// translate codepoint into bytes // translate codepoint into bytes
if (codepoint < 0x80) if (codepoint < 0x80)
...@@ -1064,7 +1064,7 @@ class lexer : public lexer_base<BasicJsonType> ...@@ -1064,7 +1064,7 @@ class lexer : public lexer_base<BasicJsonType>
// all other characters are rejected outside scan_number() // all other characters are rejected outside scan_number()
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
} }
scan_number_minus: scan_number_minus:
...@@ -1311,7 +1311,7 @@ scan_number_done: ...@@ -1311,7 +1311,7 @@ scan_number_done:
const auto x = strtoull(token_buffer.data(), &endptr, is_64_bit<number_unsigned_t>()); const auto x = strtoull(token_buffer.data(), &endptr, is_64_bit<number_unsigned_t>());
// we checked the number format before // we checked the number format before
assert(endptr == token_buffer.data() + token_buffer.size()); JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
if (errno == 0) if (errno == 0)
{ {
...@@ -1327,7 +1327,7 @@ scan_number_done: ...@@ -1327,7 +1327,7 @@ scan_number_done:
const auto x = strtoll(token_buffer.data(), &endptr, is_64_bit<number_integer_t>()); const auto x = strtoll(token_buffer.data(), &endptr, is_64_bit<number_integer_t>());
// we checked the number format before // we checked the number format before
assert(endptr == token_buffer.data() + token_buffer.size()); JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
if (errno == 0) if (errno == 0)
{ {
...@@ -1344,7 +1344,7 @@ scan_number_done: ...@@ -1344,7 +1344,7 @@ scan_number_done:
strtof(value_float, token_buffer.data(), &endptr); strtof(value_float, token_buffer.data(), &endptr);
// we checked the number format before // we checked the number format before
assert(endptr == token_buffer.data() + token_buffer.size()); JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
return token_type::value_float; return token_type::value_float;
} }
...@@ -1358,7 +1358,7 @@ scan_number_done: ...@@ -1358,7 +1358,7 @@ scan_number_done:
token_type scan_literal(const char_type* literal_text, const std::size_t length, token_type scan_literal(const char_type* literal_text, const std::size_t length,
token_type return_type) token_type return_type)
{ {
assert(std::char_traits<char_type>::to_char_type(current) == literal_text[0]); JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
for (std::size_t i = 1; i < length; ++i) for (std::size_t i = 1; i < length; ++i)
{ {
if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i])) if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
...@@ -1450,7 +1450,7 @@ scan_number_done: ...@@ -1450,7 +1450,7 @@ scan_number_done:
if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof())) if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
{ {
assert(not token_string.empty()); JSON_ASSERT(not token_string.empty());
token_string.pop_back(); token_string.pop_back();
} }
} }
......
include/nlohmann/detail/input/parser.hpp
#pragma once #pragma once
#include <cassert> // assert
#include <cmath> // isfinite #include <cmath> // isfinite
#include <cstdint> // uint8_t #include <cstdint> // uint8_t
#include <functional> // function #include <functional> // function
...@@ -383,7 +382,7 @@ class parser ...@@ -383,7 +382,7 @@ class parser
// new value, we need to evaluate the new state first. // new value, we need to evaluate the new state first.
// By setting skip_to_state_evaluation to false, we // By setting skip_to_state_evaluation to false, we
// are effectively jumping to the beginning of this if. // are effectively jumping to the beginning of this if.
assert(not states.empty()); JSON_ASSERT(not states.empty());
states.pop_back(); states.pop_back();
skip_to_state_evaluation = true; skip_to_state_evaluation = true;
continue; continue;
...@@ -439,7 +438,7 @@ class parser ...@@ -439,7 +438,7 @@ class parser
// new value, we need to evaluate the new state first. // new value, we need to evaluate the new state first.
// By setting skip_to_state_evaluation to false, we // By setting skip_to_state_evaluation to false, we
// are effectively jumping to the beginning of this if. // are effectively jumping to the beginning of this if.
assert(not states.empty()); JSON_ASSERT(not states.empty());
states.pop_back(); states.pop_back();
skip_to_state_evaluation = true; skip_to_state_evaluation = true;
continue; continue;
......
include/nlohmann/detail/iterators/iter_impl.hpp
...@@ -85,7 +85,7 @@ class iter_impl ...@@ -85,7 +85,7 @@ class iter_impl
*/ */
explicit iter_impl(pointer object) noexcept : m_object(object) explicit iter_impl(pointer object) noexcept : m_object(object)
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -171,7 +171,7 @@ class iter_impl ...@@ -171,7 +171,7 @@ class iter_impl
*/ */
void set_begin() noexcept void set_begin() noexcept
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -208,7 +208,7 @@ class iter_impl ...@@ -208,7 +208,7 @@ class iter_impl
*/ */
void set_end() noexcept void set_end() noexcept
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -239,19 +239,19 @@ class iter_impl ...@@ -239,19 +239,19 @@ class iter_impl
*/ */
reference operator*() const reference operator*() const
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case value_t::object: case value_t::object:
{ {
assert(m_it.object_iterator != m_object->m_value.object->end()); JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
return m_it.object_iterator->second; return m_it.object_iterator->second;
} }
case value_t::array: case value_t::array:
{ {
assert(m_it.array_iterator != m_object->m_value.array->end()); JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
return *m_it.array_iterator; return *m_it.array_iterator;
} }
...@@ -276,19 +276,19 @@ class iter_impl ...@@ -276,19 +276,19 @@ class iter_impl
*/ */
pointer operator->() const pointer operator->() const
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
case value_t::object: case value_t::object:
{ {
assert(m_it.object_iterator != m_object->m_value.object->end()); JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
return &(m_it.object_iterator->second); return &(m_it.object_iterator->second);
} }
case value_t::array: case value_t::array:
{ {
assert(m_it.array_iterator != m_object->m_value.array->end()); JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
return &*m_it.array_iterator; return &*m_it.array_iterator;
} }
...@@ -321,7 +321,7 @@ class iter_impl ...@@ -321,7 +321,7 @@ class iter_impl
*/ */
iter_impl& operator++() iter_impl& operator++()
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -364,7 +364,7 @@ class iter_impl ...@@ -364,7 +364,7 @@ class iter_impl
*/ */
iter_impl& operator--() iter_impl& operator--()
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -402,7 +402,7 @@ class iter_impl ...@@ -402,7 +402,7 @@ class iter_impl
JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers")); JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
} }
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -438,7 +438,7 @@ class iter_impl ...@@ -438,7 +438,7 @@ class iter_impl
JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers")); JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
} }
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -486,7 +486,7 @@ class iter_impl ...@@ -486,7 +486,7 @@ class iter_impl
*/ */
iter_impl& operator+=(difference_type i) iter_impl& operator+=(difference_type i)
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -557,7 +557,7 @@ class iter_impl ...@@ -557,7 +557,7 @@ class iter_impl
*/ */
difference_type operator-(const iter_impl& other) const difference_type operator-(const iter_impl& other) const
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -578,7 +578,7 @@ class iter_impl ...@@ -578,7 +578,7 @@ class iter_impl
*/ */
reference operator[](difference_type n) const reference operator[](difference_type n) const
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
switch (m_object->m_type) switch (m_object->m_type)
{ {
...@@ -609,7 +609,7 @@ class iter_impl ...@@ -609,7 +609,7 @@ class iter_impl
*/ */
const typename object_t::key_type& key() const const typename object_t::key_type& key() const
{ {
assert(m_object != nullptr); JSON_ASSERT(m_object != nullptr);
if (JSON_HEDLEY_LIKELY(m_object->is_object())) if (JSON_HEDLEY_LIKELY(m_object->is_object()))
{ {
......
include/nlohmann/detail/iterators/iteration_proxy.hpp
...@@ -74,7 +74,7 @@ template <typename IteratorType> class iteration_proxy_value ...@@ -74,7 +74,7 @@ template <typename IteratorType> class iteration_proxy_value
/// return key of the iterator /// return key of the iterator
const string_type& key() const const string_type& key() const
{ {
assert(anchor.m_object != nullptr); JSON_ASSERT(anchor.m_object != nullptr);
switch (anchor.m_object->type()) switch (anchor.m_object->type())
{ {
......
include/nlohmann/detail/json_pointer.hpp
#pragma once #pragma once
#include <algorithm> // all_of #include <algorithm> // all_of
#include <cassert> // assert
#include <cctype> // isdigit #include <cctype> // isdigit
#include <limits> // max #include <limits> // max
#include <numeric> // accumulate #include <numeric> // accumulate
...@@ -781,7 +780,7 @@ class json_pointer ...@@ -781,7 +780,7 @@ class json_pointer
pos != std::string::npos; pos != std::string::npos;
pos = reference_token.find_first_of('~', pos + 1)) pos = reference_token.find_first_of('~', pos + 1))
{ {
assert(reference_token[pos] == '~'); JSON_ASSERT(reference_token[pos] == '~');
// ~ must be followed by 0 or 1 // ~ must be followed by 0 or 1
if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 or if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 or
...@@ -816,7 +815,7 @@ class json_pointer ...@@ -816,7 +815,7 @@ class json_pointer
static void replace_substring(std::string& s, const std::string& f, static void replace_substring(std::string& s, const std::string& f,
const std::string& t) const std::string& t)
{ {
assert(not f.empty()); JSON_ASSERT(not f.empty());
for (auto pos = s.find(f); // find first occurrence of f for (auto pos = s.find(f); // find first occurrence of f
pos != std::string::npos; // make sure f was found pos != std::string::npos; // make sure f was found
s.replace(pos, f.size(), t), // replace with t, and s.replace(pos, f.size(), t), // replace with t, and
......
include/nlohmann/detail/macro_scope.hpp
...@@ -77,6 +77,12 @@ ...@@ -77,6 +77,12 @@
#define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
#endif #endif
// allow to override assert
#if !defined(JSON_ASSERT)
#include <cassert> // assert
#define JSON_ASSERT(x) assert(x)
#endif
/*! /*!
@brief macro to briefly define a mapping between an enum and JSON @brief macro to briefly define a mapping between an enum and JSON
@def NLOHMANN_JSON_SERIALIZE_ENUM @def NLOHMANN_JSON_SERIALIZE_ENUM
......
include/nlohmann/detail/macro_unscope.hpp
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#endif #endif
// clean up // clean up
#undef JSON_ASSERT
#undef JSON_INTERNAL_CATCH #undef JSON_INTERNAL_CATCH
#undef JSON_CATCH #undef JSON_CATCH
#undef JSON_THROW #undef JSON_THROW
......
include/nlohmann/detail/output/binary_writer.hpp
...@@ -38,7 +38,7 @@ class binary_writer ...@@ -38,7 +38,7 @@ class binary_writer
*/ */
explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter) explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
{ {
assert(oa); JSON_ASSERT(oa);
} }
/*! /*!
...@@ -754,7 +754,7 @@ class binary_writer ...@@ -754,7 +754,7 @@ class binary_writer
bool prefix_required = true; bool prefix_required = true;
if (use_type and not j.m_value.array->empty()) if (use_type and not j.m_value.array->empty())
{ {
assert(use_count); JSON_ASSERT(use_count);
const CharType first_prefix = ubjson_prefix(j.front()); const CharType first_prefix = ubjson_prefix(j.front());
const bool same_prefix = std::all_of(j.begin() + 1, j.end(), const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
[this, first_prefix](const BasicJsonType & v) [this, first_prefix](const BasicJsonType & v)
...@@ -798,7 +798,7 @@ class binary_writer ...@@ -798,7 +798,7 @@ class binary_writer
if (use_type and not j.m_value.binary->empty()) if (use_type and not j.m_value.binary->empty())
{ {
assert(use_count); JSON_ASSERT(use_count);
oa->write_character(to_char_type('$')); oa->write_character(to_char_type('$'));
oa->write_character('U'); oa->write_character('U');
} }
...@@ -842,7 +842,7 @@ class binary_writer ...@@ -842,7 +842,7 @@ class binary_writer
bool prefix_required = true; bool prefix_required = true;
if (use_type and not j.m_value.object->empty()) if (use_type and not j.m_value.object->empty())
{ {
assert(use_count); JSON_ASSERT(use_count);
const CharType first_prefix = ubjson_prefix(j.front()); const CharType first_prefix = ubjson_prefix(j.front());
const bool same_prefix = std::all_of(j.begin(), j.end(), const bool same_prefix = std::all_of(j.begin(), j.end(),
[this, first_prefix](const BasicJsonType & v) [this, first_prefix](const BasicJsonType & v)
...@@ -1134,7 +1134,7 @@ class binary_writer ...@@ -1134,7 +1134,7 @@ class binary_writer
// LCOV_EXCL_START // LCOV_EXCL_START
default: default:
assert(false); JSON_ASSERT(false);
return 0ul; return 0ul;
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
} }
...@@ -1181,7 +1181,7 @@ class binary_writer ...@@ -1181,7 +1181,7 @@ class binary_writer
// LCOV_EXCL_START // LCOV_EXCL_START
default: default:
assert(false); JSON_ASSERT(false);
return; return;
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
} }
......
include/nlohmann/detail/output/serializer.hpp
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#include <algorithm> // reverse, remove, fill, find, none_of #include <algorithm> // reverse, remove, fill, find, none_of
#include <array> // array #include <array> // array
#include <cassert> // assert
#include <clocale> // localeconv, lconv #include <clocale> // localeconv, lconv
#include <cmath> // labs, isfinite, isnan, signbit #include <cmath> // labs, isfinite, isnan, signbit
#include <cstddef> // size_t, ptrdiff_t #include <cstddef> // size_t, ptrdiff_t
...@@ -135,8 +134,8 @@ class serializer ...@@ -135,8 +134,8 @@ class serializer
} }
// last element // last element
assert(i != val.m_value.object->cend()); JSON_ASSERT(i != val.m_value.object->cend());
assert(std::next(i) == val.m_value.object->cend()); JSON_ASSERT(std::next(i) == val.m_value.object->cend());
o->write_characters(indent_string.c_str(), new_indent); o->write_characters(indent_string.c_str(), new_indent);
o->write_character('\"'); o->write_character('\"');
dump_escaped(i->first, ensure_ascii); dump_escaped(i->first, ensure_ascii);
...@@ -163,8 +162,8 @@ class serializer ...@@ -163,8 +162,8 @@ class serializer
} }
// last element // last element
assert(i != val.m_value.object->cend()); JSON_ASSERT(i != val.m_value.object->cend());
assert(std::next(i) == val.m_value.object->cend()); JSON_ASSERT(std::next(i) == val.m_value.object->cend());
o->write_character('\"'); o->write_character('\"');
dump_escaped(i->first, ensure_ascii); dump_escaped(i->first, ensure_ascii);
o->write_characters("\":", 2); o->write_characters("\":", 2);
...@@ -205,7 +204,7 @@ class serializer ...@@ -205,7 +204,7 @@ class serializer
} }
// last element // last element
assert(not val.m_value.array->empty()); JSON_ASSERT(not val.m_value.array->empty());
o->write_characters(indent_string.c_str(), new_indent); o->write_characters(indent_string.c_str(), new_indent);
dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent); dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
...@@ -226,7 +225,7 @@ class serializer ...@@ -226,7 +225,7 @@ class serializer
} }
// last element // last element
assert(not val.m_value.array->empty()); JSON_ASSERT(not val.m_value.array->empty());
dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent); dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
o->write_character(']'); o->write_character(']');
...@@ -360,7 +359,7 @@ class serializer ...@@ -360,7 +359,7 @@ class serializer
} }
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
} }
} }
...@@ -559,7 +558,7 @@ class serializer ...@@ -559,7 +558,7 @@ class serializer
} }
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
} }
break; break;
} }
...@@ -622,7 +621,7 @@ class serializer ...@@ -622,7 +621,7 @@ class serializer
} }
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
} }
} }
} }
...@@ -723,7 +722,7 @@ class serializer ...@@ -723,7 +722,7 @@ class serializer
} }
// spare 1 byte for '\0' // spare 1 byte for '\0'
assert(n_chars < number_buffer.size() - 1); JSON_ASSERT(n_chars < number_buffer.size() - 1);
// jump to the end to generate the string from backward // jump to the end to generate the string from backward
// so we later avoid reversing the result // so we later avoid reversing the result
...@@ -799,9 +798,9 @@ class serializer ...@@ -799,9 +798,9 @@ class serializer
std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x); std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
// negative value indicates an error // negative value indicates an error
assert(len > 0); JSON_ASSERT(len > 0);
// check if buffer was large enough // check if buffer was large enough
assert(static_cast<std::size_t>(len) < number_buffer.size()); JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
// erase thousands separator // erase thousands separator
if (thousands_sep != '\0') if (thousands_sep != '\0')
...@@ -809,7 +808,7 @@ class serializer ...@@ -809,7 +808,7 @@ class serializer
const auto end = std::remove(number_buffer.begin(), const auto end = std::remove(number_buffer.begin(),
number_buffer.begin() + len, thousands_sep); number_buffer.begin() + len, thousands_sep);
std::fill(end, number_buffer.end(), '\0'); std::fill(end, number_buffer.end(), '\0');
assert((end - number_buffer.begin()) <= len); JSON_ASSERT((end - number_buffer.begin()) <= len);
len = (end - number_buffer.begin()); len = (end - number_buffer.begin());
} }
...@@ -889,7 +888,7 @@ class serializer ...@@ -889,7 +888,7 @@ class serializer
: (0xFFu >> type) & (byte); : (0xFFu >> type) & (byte);
std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type); std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
assert(index < 400); JSON_ASSERT(index < 400);
state = utf8d[index]; state = utf8d[index];
return state; return state;
} }
...@@ -901,7 +900,7 @@ class serializer ...@@ -901,7 +900,7 @@ class serializer
*/ */
number_unsigned_t remove_sign(number_unsigned_t x) number_unsigned_t remove_sign(number_unsigned_t x)
{ {
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
return x; // LCOV_EXCL_LINE return x; // LCOV_EXCL_LINE
} }
...@@ -916,7 +915,7 @@ class serializer ...@@ -916,7 +915,7 @@ class serializer
*/ */
inline number_unsigned_t remove_sign(number_integer_t x) noexcept inline number_unsigned_t remove_sign(number_integer_t x) noexcept
{ {
assert(x < 0 and x < (std::numeric_limits<number_integer_t>::max)()); JSON_ASSERT(x < 0 and x < (std::numeric_limits<number_integer_t>::max)());
return static_cast<number_unsigned_t>(-(x + 1)) + 1; return static_cast<number_unsigned_t>(-(x + 1)) + 1;
} }
......
include/nlohmann/json.hpp
...@@ -35,7 +35,6 @@ SOFTWARE. ...@@ -35,7 +35,6 @@ SOFTWARE.
#define NLOHMANN_JSON_VERSION_PATCH 0 #define NLOHMANN_JSON_VERSION_PATCH 0
#include <algorithm> // all_of, find, for_each #include <algorithm> // all_of, find, for_each
#include <cassert> // assert
#include <cstddef> // nullptr_t, ptrdiff_t, size_t #include <cstddef> // nullptr_t, ptrdiff_t, size_t
#include <functional> // hash, less #include <functional> // hash, less
#include <initializer_list> // initializer_list #include <initializer_list> // initializer_list
...@@ -924,7 +923,7 @@ class basic_json ...@@ -924,7 +923,7 @@ class basic_json
}; };
std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter); std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...); AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
assert(object != nullptr); JSON_ASSERT(object != nullptr);
return object.release(); return object.release();
} }
...@@ -1219,10 +1218,10 @@ class basic_json ...@@ -1219,10 +1218,10 @@ class basic_json
*/ */
void assert_invariant() const noexcept void assert_invariant() const noexcept
{ {
assert(m_type != value_t::object or m_value.object != nullptr); JSON_ASSERT(m_type != value_t::object or m_value.object != nullptr);
assert(m_type != value_t::array or m_value.array != nullptr); JSON_ASSERT(m_type != value_t::array or m_value.array != nullptr);
assert(m_type != value_t::string or m_value.string != nullptr); JSON_ASSERT(m_type != value_t::string or m_value.string != nullptr);
assert(m_type != value_t::binary or m_value.binary != nullptr); JSON_ASSERT(m_type != value_t::binary or m_value.binary != nullptr);
} }
public: public:
...@@ -1515,7 +1514,7 @@ class basic_json ...@@ -1515,7 +1514,7 @@ class basic_json
m_type = value_t::discarded; m_type = value_t::discarded;
break; break;
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
} }
assert_invariant(); assert_invariant();
} }
...@@ -1915,8 +1914,8 @@ class basic_json ...@@ -1915,8 +1914,8 @@ class basic_json
std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0> std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0>
basic_json(InputIT first, InputIT last) basic_json(InputIT first, InputIT last)
{ {
assert(first.m_object != nullptr); JSON_ASSERT(first.m_object != nullptr);
assert(last.m_object != nullptr); JSON_ASSERT(last.m_object != nullptr);
// make sure iterator fits the current value // make sure iterator fits the current value
if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object)) if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
...@@ -3633,7 +3632,7 @@ class basic_json ...@@ -3633,7 +3632,7 @@ class basic_json
// const operator[] only works for objects // const operator[] only works for objects
if (JSON_HEDLEY_LIKELY(is_object())) if (JSON_HEDLEY_LIKELY(is_object()))
{ {
assert(m_value.object->find(key) != m_value.object->end()); JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
return m_value.object->find(key)->second; return m_value.object->find(key)->second;
} }
...@@ -3725,7 +3724,7 @@ class basic_json ...@@ -3725,7 +3724,7 @@ class basic_json
// at only works for objects // at only works for objects
if (JSON_HEDLEY_LIKELY(is_object())) if (JSON_HEDLEY_LIKELY(is_object()))
{ {
assert(m_value.object->find(key) != m_value.object->end()); JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
return m_value.object->find(key)->second; return m_value.object->find(key)->second;
} }
...@@ -5493,7 +5492,7 @@ class basic_json ...@@ -5493,7 +5492,7 @@ class basic_json
iterator insert_iterator(const_iterator pos, Args&& ... args) iterator insert_iterator(const_iterator pos, Args&& ... args)
{ {
iterator result(this); iterator result(this);
assert(m_value.array != nullptr); JSON_ASSERT(m_value.array != nullptr);
auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator); auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...); m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
...@@ -8258,7 +8257,7 @@ class basic_json ...@@ -8258,7 +8257,7 @@ class basic_json
// if there exists a parent it cannot be primitive // if there exists a parent it cannot be primitive
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
assert(false); // LCOV_EXCL_LINE JSON_ASSERT(false); // LCOV_EXCL_LINE
} }
}; };
......
test/CMakeLists.txt
...@@ -96,6 +96,7 @@ set(files ...@@ -96,6 +96,7 @@ set(files
src/unit-allocator.cpp src/unit-allocator.cpp
src/unit-alt-number.cpp src/unit-alt-number.cpp
src/unit-alt-string.cpp src/unit-alt-string.cpp
src/unit-assert_macro.cpp
src/unit-bson.cpp src/unit-bson.cpp
src/unit-capacity.cpp src/unit-capacity.cpp
src/unit-cbor.cpp src/unit-cbor.cpp
......
test/src/unit-assert_macro.cpp 0 → 100644
/*
__ _____ _____ _____
__| | __| | | | JSON for Modern C++ (test suite)
| | |__ | | | | | | version 3.8.0
|_____|_____|_____|_|___| https://github.com/nlohmann/json
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
SPDX-License-Identifier: MIT
Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
// avoid warning when assert does not abort
#if defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wstrict-overflow"
#endif
#include "doctest_compatibility.h"
/// global variable to record side effect of assert calls
static int assert_counter;
/// set failure variable to true instead of calling assert(x)
#define JSON_ASSERT(x) {if (!(x)) ++assert_counter; }
#include <nlohmann/json.hpp>
using nlohmann::json;
// the test assumes exceptions to work
#if not defined(JSON_NOEXCEPTION)
TEST_CASE("JSON_ASSERT(x)")
{
SECTION("basic_json(first, second)")
{
assert_counter = 0;
CHECK(assert_counter == 0);
json::iterator it;
json j;
// in case assertions do not abort execution, an exception is thrown
CHECK_THROWS_WITH_AS(json(it, j.end()), "[json.exception.invalid_iterator.201] iterators are not compatible", json::invalid_iterator);
// check that assertion actually happened
CHECK(assert_counter == 1);
}
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment