mirror of
https://github.com/nlohmann/json.git
synced 2026-09-06 00:08:00 +00:00
Several places in the library hand-roll compiler diagnostic suppression
with raw `#pragma`/`#ifdef __GNUC__`/`#ifdef __clang__` guards instead of
using the Hedley primitives already bundled and used elsewhere
(JSON_HEDLEY_DIAGNOSTIC_PUSH/POP, JSON_HEDLEY_PRAGMA, ...). Converted six
of the seven listed push/pop pairs to use those primitives instead of
raw `#pragma GCC diagnostic`/`#pragma clang diagnostic` text:
- include/nlohmann/json.hpp (~3770, ~3863): -Wfloat-equal
- include/nlohmann/detail/conversions/to_chars.hpp (~1078): -Wfloat-equal
- include/nlohmann/detail/output/binary_writer.hpp (~1844): -Wfloat-equal
- include/nlohmann/detail/iterators/iteration_proxy.hpp (~211): -Wmismatched-tags
- include/nlohmann/detail/exceptions.hpp (~36): -Wweak-vtables
iteration_proxy.hpp did not previously include macro_scope.hpp itself
(it only compiled because some other header included earlier in
json.hpp happened to pull macro_scope.hpp in first); it now includes it
directly like the other detail headers that use Hedley macros, so it is
self-contained.
Each push/pop pair now uses JSON_HEDLEY_DIAGNOSTIC_PUSH/POP
unconditionally (a no-op on compilers that don't need it) and wraps the
actual `#pragma ... diagnostic ignored` text in JSON_HEDLEY_PRAGMA so it
goes through Hedley's _Pragma()-based emission instead of a raw #pragma
line, while keeping the original `#ifdef __GNUC__` / `#if
defined(__clang__)` guard around the ignored-pragma itself.
Deviation from the issue's suggested transformation: the issue's example
replaces the `#ifdef __GNUC__` guard with `#if
JSON_HEDLEY_HAS_WARNING("-Wfloat-equal")`. JSON_HEDLEY_HAS_WARNING is
implemented purely via Clang's `__has_warning` builtin and evaluates to
0 on real GCC (`#define JSON_HEDLEY_HAS_WARNING(warning) (0)` when
`__has_warning` is not defined), so adopting it verbatim would silently
stop suppressing -Wfloat-equal on GCC -- a real regression, not just a
style change. The existing `#ifdef __GNUC__` / `#if defined(__clang__)`
guards were kept for the ignored-pragma to stay behavior-preserving, and
only the push/pop/pragma-emission mechanism was routed through Hedley.
Two of the seven locations from the issue (the -Wignored-attributes
push at the very top of json.hpp and its matching pop after
`#include <nlohmann/detail/macro_unscope.hpp>`) were intentionally left
unconverted:
- The push, at the very top of json.hpp, runs before
`detail/macro_scope.hpp` (and therefore hedley.hpp) has been included
anywhere in the translation unit, so JSON_HEDLEY_DIAGNOSTIC_PUSH is not
yet defined at that point.
- The pop runs after `macro_unscope.hpp`, which -- via hedley_undef.hpp
-- has already #undef'd every JSON_HEDLEY_* macro (by design, see
#5408) precisely so they don't leak to users, so JSON_HEDLEY_DIAGNOSTIC_POP
is no longer defined by the time the pop is reached either.
Making this one pair work would require either hoisting the ~2000
line vendored hedley.hpp to the very top of the amalgamated single
header (a much bigger structural change to single_include than a pure
mechanism swap) or special-casing this one pop ahead of the general
macro cleanup. Both are riskier than the mechanical, behavior-preserving
change requested, so this pair was left as-is.
## Validation
- Compiled include/nlohmann/json.hpp and single_include/nlohmann/json.hpp
with `-Wall -Wextra -Wfloat-equal -Wmismatched-tags -Wweak-vtables`
(clang, which self-identifies as __GNUC__ too): no warnings, same as
before the change.
- Compiled and ran tests/src/unit-to_chars.cpp, unit-conversions.cpp,
unit-iterators1.cpp, unit-iterators2.cpp, and unit-class_parser.cpp
against the fixed include/: all pass.
- Compiled unit-msgpack.cpp, unit-bjdata.cpp, and unit-ubjson.cpp (which
exercise binary_writer.hpp's write_compact_float extensively): all
compile cleanly; the vast majority of assertions pass (the only
failures are pre-existing environment issues unrelated to this change
-- missing generated test-data files, not code correctness).
- Ran `make amalgamate`; the single_include diff is limited to exactly
the lines touched in include/, with no unrelated reordering.
- No real (non-Apple) GCC was available in this environment to test
directly; the `_Pragma("GCC diagnostic ...")` text emitted by
JSON_HEDLEY_PRAGMA is byte-identical to the prior `#pragma GCC
diagnostic ...` text, and the `#ifdef __GNUC__` guard is unchanged, so
GCC's behavior is expected to be identical. CI covers the GCC matrix.
This PR is stacked on top of #5475 (issue-5408-hedley-undef-leak) since
both touch the same files; only the last commit here is new.
Fixes #5409.
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
235 lines
7.9 KiB
C++
235 lines
7.9 KiB
C++
// __ _____ _____ _____
|
|
// __| | __| | | | 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
|
|
|
|
#pragma once
|
|
|
|
#include <cstddef> // size_t
|
|
#include <iterator> // forward_iterator_tag
|
|
#include <tuple> // tuple_size, get, tuple_element
|
|
#include <utility> // move
|
|
|
|
#if JSON_HAS_RANGES
|
|
#include <ranges> // enable_borrowed_range
|
|
#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>
|
|
|
|
NLOHMANN_JSON_NAMESPACE_BEGIN
|
|
namespace detail
|
|
{
|
|
|
|
template<typename IteratorType> class iteration_proxy_value
|
|
{
|
|
public:
|
|
using difference_type = std::ptrdiff_t;
|
|
using value_type = iteration_proxy_value;
|
|
using pointer = value_type *;
|
|
using reference = value_type &;
|
|
using iterator_category = std::forward_iterator_tag;
|
|
using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
|
|
|
|
private:
|
|
/// the iterator
|
|
IteratorType anchor{};
|
|
/// an index for arrays (used to create key names)
|
|
std::size_t array_index = 0;
|
|
/// last stringified array index
|
|
mutable std::size_t array_index_last = 0;
|
|
/// a string representation of the array index
|
|
mutable string_type array_index_str = "0";
|
|
/// an empty string (to return a reference for primitive values)
|
|
string_type empty_str{};
|
|
|
|
public:
|
|
explicit iteration_proxy_value() = default;
|
|
explicit iteration_proxy_value(IteratorType it, std::size_t array_index_ = 0)
|
|
noexcept(std::is_nothrow_move_constructible<IteratorType>::value
|
|
&& std::is_nothrow_default_constructible<string_type>::value)
|
|
: anchor(std::move(it))
|
|
, array_index(array_index_)
|
|
{}
|
|
|
|
iteration_proxy_value(iteration_proxy_value const&) = default;
|
|
iteration_proxy_value& operator=(iteration_proxy_value const&) = default;
|
|
// older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
|
|
iteration_proxy_value(iteration_proxy_value&&)
|
|
noexcept(std::is_nothrow_move_constructible<IteratorType>::value
|
|
&& std::is_nothrow_move_constructible<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
|
|
iteration_proxy_value& operator=(iteration_proxy_value&&)
|
|
noexcept(std::is_nothrow_move_assignable<IteratorType>::value
|
|
&& std::is_nothrow_move_assignable<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
|
|
~iteration_proxy_value() = default;
|
|
|
|
/// dereference operator (needed for range-based for)
|
|
const iteration_proxy_value& operator*() const
|
|
{
|
|
return *this;
|
|
}
|
|
|
|
/// increment operator (needed for range-based for)
|
|
iteration_proxy_value& operator++()
|
|
{
|
|
++anchor;
|
|
++array_index;
|
|
|
|
return *this;
|
|
}
|
|
|
|
iteration_proxy_value operator++(int)& // NOLINT(cert-dcl21-cpp)
|
|
{
|
|
auto tmp = iteration_proxy_value(anchor, array_index);
|
|
++anchor;
|
|
++array_index;
|
|
return tmp;
|
|
}
|
|
|
|
/// equality operator (needed for InputIterator)
|
|
bool operator==(const iteration_proxy_value& o) const
|
|
{
|
|
return anchor == o.anchor;
|
|
}
|
|
|
|
/// inequality operator (needed for range-based for)
|
|
bool operator!=(const iteration_proxy_value& o) const
|
|
{
|
|
return anchor != o.anchor;
|
|
}
|
|
|
|
/// return key of the iterator
|
|
const string_type& key() const
|
|
{
|
|
JSON_ASSERT(anchor.m_object != nullptr);
|
|
|
|
switch (anchor.m_object->type())
|
|
{
|
|
// use integer array index as key
|
|
case value_t::array:
|
|
{
|
|
if (array_index != array_index_last)
|
|
{
|
|
int_to_string( array_index_str, array_index );
|
|
array_index_last = array_index;
|
|
}
|
|
return array_index_str;
|
|
}
|
|
|
|
// use key from the object
|
|
case value_t::object:
|
|
return anchor.key();
|
|
|
|
// use an empty key for all primitive types
|
|
case value_t::null:
|
|
case value_t::string:
|
|
case value_t::boolean:
|
|
case value_t::number_integer:
|
|
case value_t::number_unsigned:
|
|
case value_t::number_float:
|
|
case value_t::binary:
|
|
case value_t::discarded:
|
|
default:
|
|
return empty_str;
|
|
}
|
|
}
|
|
|
|
/// return value of the iterator
|
|
typename IteratorType::reference value() const
|
|
{
|
|
return anchor.value();
|
|
}
|
|
};
|
|
|
|
/// proxy class for the items() function
|
|
template<typename IteratorType> class iteration_proxy
|
|
{
|
|
private:
|
|
/// the container to iterate
|
|
typename IteratorType::pointer container = nullptr;
|
|
|
|
public:
|
|
explicit iteration_proxy() = default;
|
|
|
|
/// construct iteration proxy from a container
|
|
explicit iteration_proxy(typename IteratorType::reference cont) noexcept
|
|
: container(&cont) {}
|
|
|
|
iteration_proxy(iteration_proxy const&) = default;
|
|
iteration_proxy& operator=(iteration_proxy const&) = default;
|
|
iteration_proxy(iteration_proxy&&) noexcept = default;
|
|
iteration_proxy& operator=(iteration_proxy&&) noexcept = default;
|
|
~iteration_proxy() = default;
|
|
|
|
/// return iterator begin (needed for range-based for)
|
|
iteration_proxy_value<IteratorType> begin() const noexcept
|
|
{
|
|
return iteration_proxy_value<IteratorType>(container->begin());
|
|
}
|
|
|
|
/// return iterator end (needed for range-based for)
|
|
iteration_proxy_value<IteratorType> end() const noexcept
|
|
{
|
|
return iteration_proxy_value<IteratorType>(container->end());
|
|
}
|
|
};
|
|
|
|
// Structured Bindings Support
|
|
// For further reference see https://blog.tartanllama.xyz/structured-bindings/
|
|
// And see https://github.com/nlohmann/json/pull/1391
|
|
template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
|
|
auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
|
|
{
|
|
return i.key();
|
|
}
|
|
// Structured Bindings Support
|
|
// For further reference see https://blog.tartanllama.xyz/structured-bindings/
|
|
// And see https://github.com/nlohmann/json/pull/1391
|
|
template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
|
|
auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
|
|
{
|
|
return i.value();
|
|
}
|
|
|
|
} // namespace detail
|
|
NLOHMANN_JSON_NAMESPACE_END
|
|
|
|
// The Addition to the STD Namespace is required to add
|
|
// Structured Bindings Support to the iteration_proxy_value class
|
|
// For further reference see https://blog.tartanllama.xyz/structured-bindings/
|
|
// And see https://github.com/nlohmann/json/pull/1391
|
|
namespace std
|
|
{
|
|
|
|
// Fix: https://github.com/nlohmann/json/issues/1401
|
|
JSON_HEDLEY_DIAGNOSTIC_PUSH
|
|
#if defined(__clang__)
|
|
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)
|
|
: public std::integral_constant<std::size_t, 2> {};
|
|
|
|
template<std::size_t N, typename IteratorType>
|
|
class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> // NOLINT(cert-dcl58-cpp)
|
|
{
|
|
public:
|
|
using type = decltype(
|
|
get<N>(std::declval <
|
|
::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
|
|
};
|
|
JSON_HEDLEY_DIAGNOSTIC_POP
|
|
|
|
} // namespace std
|
|
|
|
#if JSON_HAS_RANGES
|
|
template <typename IteratorType>
|
|
inline constexpr bool ::std::ranges::enable_borrowed_range<::nlohmann::detail::iteration_proxy<IteratorType>> = true;
|
|
#endif
|