External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re run make amalgamate

Browse Source
This commit is contained in:
Raphael Grimm 2021-10-31 13:30:58 +01:00 committed by barcode
parent 51d8c28ea5
commit 8f4d8a6f93
2 changed files with 102 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
tests/src/unit-custom-base-class.cpp
View File

@ -255,14 +255,29 @@ void visitor_adaptor::do_visit(const Ptr& ptr, const Fnc& fnc) const
json.at(i).do_visit(ptr / std::to_string(i), fnc); json.at(i).do_visit(ptr / std::to_string(i), fnc);
} }
break; break;
case value_t::discarded: break; case value_t::discarded:
case value_t::null: fnc(ptr, json); break; break;
case value_t::string: fnc(ptr, json); break; case value_t::null:
case value_t::boolean: fnc(ptr, json); break; fnc(ptr, json);
case value_t::number_integer: fnc(ptr, json); break; break;
case value_t::number_unsigned: fnc(ptr, json); break; case value_t::string:
case value_t::number_float: fnc(ptr, json); break; fnc(ptr, json);
case value_t::binary: fnc(ptr, json); break; break;
case value_t::boolean:
fnc(ptr, json);
break;
case value_t::number_integer:
fnc(ptr, json);
break;
case value_t::number_unsigned:
fnc(ptr, json);
break;
case value_t::number_float:
fnc(ptr, json);
break;
case value_t::binary:
fnc(ptr, json);
break;
default: default:
fnc(ptr, json); fnc(ptr, json);
} }
@ -311,17 +326,39 @@ TEST_CASE("JSON Visit Node")
using value_t = nlohmann::detail::value_t; using value_t = nlohmann::detail::value_t;
switch (j.type()) switch (j.type())
{ {
case value_t::object: str << "object"; break; case value_t::object:
case value_t::array: str << "array"; break; str << "object";
case value_t::discarded: str << "discarded"; break; break;
case value_t::null: str << "null"; break; case value_t::array:
case value_t::string: str << "string"; break; str << "array";
case value_t::boolean: str << "boolean"; break; break;
case value_t::number_integer: str << "number_integer"; break; case value_t::discarded:
case value_t::number_unsigned: str << "number_unsigned"; break; str << "discarded";
case value_t::number_float: str << "number_float"; break; break;
case value_t::binary: str << "binary"; break; case value_t::null:
default: str << "error"; break; str << "null";
break;
case value_t::string:
str << "string";
break;
case value_t::boolean:
str << "boolean";
break;
case value_t::number_integer:
str << "number_integer";
break;
case value_t::number_unsigned:
str << "number_unsigned";
break;
case value_t::number_float:
str << "number_float";
break;
case value_t::binary:
str << "binary";
break;
default:
str << "error";
break;
} }
str << " - " << j.dump(); str << " - " << j.dump();
CHECK(json.at(p) == j); CHECK(json.at(p) == j);