amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-15 18:57:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC C4127 and Infer finding in the view serializer

Browse Source 
Test the template options through enabled() so that conditions combined
with them are not constant, and mark the nav::value() null dereference
as a false positive like materialize.hpp does.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-14 17:54:25 +02:00
1 parent bad66b8707
commit dd4773e8c0
1 file changed
+13 -3
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/view/serializer.hpp
+13 -3
View File
@@ -397,6 +397,14 @@ class view_serializer
std::memcpy(to, from, n); std::memcpy(to, from, n);
} }
/// a compile-time option as a runtime condition: testing the template
/// argument directly makes a condition like `Editable && c` constant when
/// the option is off, which MSVC reports as C4127
static NLOHMANN_VIEW_ALWAYS_INLINE bool enabled(bool option) noexcept
{
return option;
}
template<bool SourceNumbers> template<bool SourceNumbers>
void dump_compact(const node* root) void dump_compact(const node* root)
{ {
@@ -473,6 +481,8 @@ class view_serializer
{ {
// write the value at n (read-only documents: and advance n) // write the value at n (read-only documents: and advance n)
bool opened = false; bool opened = false;
// false positive: n comes from nav::value(), which never returns null for a valid index
// @infer-ignore NULLPTR_DEREFERENCE
switch (static_cast<value_t>(n->kind)) switch (static_cast<value_t>(n->kind))
{ {
case value_t::string: case value_t::string:
@@ -493,14 +503,14 @@ class view_serializer
{ {
const std::uint32_t len = number_length(*n); const std::uint32_t len = number_length(*n);
room(len); room(len);
if (Editable && (n->flags & node_flags::storage) != 0) if (enabled(Editable) && (n->flags & node_flags::storage) != 0)
{ {
copy_long(w, m_doc.str(*n), len); // a canonical token written by an edit copy_long(w, m_doc.str(*n), len); // a canonical token written by an edit
w += len; w += len;
break; break;
} }
const char* const token = src + n->off; const char* const token = src + n->off;
if (!SourceNumbers && NLOHMANN_VIEW_UNLIKELY(len == 2 && token[0] == '-' && token[1] == '0')) if (!enabled(SourceNumbers) && NLOHMANN_VIEW_UNLIKELY(len == 2 && token[0] == '-' && token[1] == '0'))
{ {
*w++ = '0'; // parse() reads -0 as the integer 0 *w++ = '0'; // parse() reads -0 as the integer 0
} }
@@ -511,7 +521,7 @@ class view_serializer
break; break;
} }
case value_t::number_float: case value_t::number_float:
if (SourceNumbers && (n->flags & node_flags::storage) != node_flags::edited) if (enabled(SourceNumbers) && (n->flags & node_flags::storage) != node_flags::edited)
{ {
room(n->len); room(n->len);
copy(src + n->off, n->len); copy(src + n->off, n->len);