Scarfski/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-30 14:05:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address the clang-tidy findings of the comparisons

Browse Source 
Separate the comparison of discarded values from the other types, so
that the conditional chain has no repeated branch bodies, and mark
the deliberate comparisons of views with empty containers in the
tests.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-29 00:52:29 +02:00
parent 76a0e3befd
commit d40d049c14
3 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
include/nlohmann/detail/view/compare.hpp
View File

@@ -234,51 +234,47 @@ bool equal(const A& a0, const B& b0)
return false;
}
}
else if (numbers)
else
{
if (!(a.scalar() == b.scalar()))
if (!numbers && ta != tb)
{
return false;
}
}
else if (ta != tb)
{
return false;
}
else if (ta == value_t::string)
{
if (!(a.string() == b.string()))
if (ta == value_t::string)
{
return false;
}
}
else if (ta == value_t::array || ta == value_t::object)
{
if (a.size() != b.size() && ta == value_t::array)
{
return false;
}
frame f;
f.object = ta == value_t::object;
if (f.object)
{
a.members(f.members_a, ordered);
b.members(f.members_b, ordered);
if (f.members_a.size() != f.members_b.size())
if (!(a.string() == b.string()))
{
return false;
}
}
else
else if (ta == value_t::array || ta == value_t::object)
{
a.elements(f.elements_a);
b.elements(f.elements_b);
if (a.size() != b.size() && ta == value_t::array)
{
return false;
}
frame f;
f.object = ta == value_t::object;
if (f.object)
{
a.members(f.members_a, ordered);
b.members(f.members_b, ordered);
if (f.members_a.size() != f.members_b.size())
{
return false;
}
}
else
{
a.elements(f.elements_a);
b.elements(f.elements_b);
}
stack.push_back(std::move(f));
}
else if (!(a.scalar() == b.scalar())) // numbers (also of different types), null, boolean
{
return false;
}
stack.push_back(std::move(f));
}
else if (!(a.scalar() == b.scalar())) // null, boolean
{
return false;
}
// the next pair of values

64
single_include/nlohmann/json_view.hpp
View File

@@ -1818,51 +1818,47 @@ bool equal(const A& a0, const B& b0)
return false;
}
}
else if (numbers)
else
{
if (!(a.scalar() == b.scalar()))
if (!numbers && ta != tb)
{
return false;
}
}
else if (ta != tb)
{
return false;
}
else if (ta == value_t::string)
{
if (!(a.string() == b.string()))
if (ta == value_t::string)
{
return false;
}
}
else if (ta == value_t::array || ta == value_t::object)
{
if (a.size() != b.size() && ta == value_t::array)
{
return false;
}
frame f;
f.object = ta == value_t::object;
if (f.object)
{
a.members(f.members_a, ordered);
b.members(f.members_b, ordered);
if (f.members_a.size() != f.members_b.size())
if (!(a.string() == b.string()))
{
return false;
}
}
else
else if (ta == value_t::array || ta == value_t::object)
{
a.elements(f.elements_a);
b.elements(f.elements_b);
if (a.size() != b.size() && ta == value_t::array)
{
return false;
}
frame f;
f.object = ta == value_t::object;
if (f.object)
{
a.members(f.members_a, ordered);
b.members(f.members_b, ordered);
if (f.members_a.size() != f.members_b.size())
{
return false;
}
}
else
{
a.elements(f.elements_a);
b.elements(f.elements_b);
}
stack.push_back(std::move(f));
}
else if (!(a.scalar() == b.scalar())) // numbers (also of different types), null, boolean
{
return false;
}
stack.push_back(std::move(f));
}
else if (!(a.scalar() == b.scalar())) // null, boolean
{
return false;
}
// the next pair of values

4
tests/src/unit-json_view.cpp
View File

@@ -1252,9 +1252,9 @@ TEST_CASE("json_view comparison")
// discarded values compare as basic_json's do
const json discarded(json::value_t::discarded);
CHECK((json_view() == json_view()) == (discarded == discarded));
CHECK((json_view() == json_view()) == (discarded == discarded)); // NOLINT(readability-container-size-empty): operator== is tested
CHECK((json_view() == discarded) == (discarded == discarded));
CHECK(!(json_view() == json_document::parse("null").root()));
CHECK(!(json_view() == json_document::parse("null").root())); // NOLINT(readability-container-size-empty)
CHECK(!(json_document::parse("null").root() == discarded));
}