j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 added user-defined exceptions 313-315

Browse source
This commit is contained in:
Niels Lohmann 2017-03-05 19:58:26 +01:00
parent 144cf6a4c7
commit 9e560ca40c
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/json.hpp
View file

@ -12059,7 +12059,7 @@ basic_json_parser_74:
*/
default:
{
JSON_THROW(std::domain_error("invalid value to unflatten"));
JSON_THROW(type_error(313, "invalid value to unflatten"));
}
}
}
@ -12496,7 +12496,7 @@ basic_json_parser_74:
{
if (not value.is_object())
{
JSON_THROW(std::domain_error("only objects can be unflattened"));
JSON_THROW(type_error(314, "only objects can be unflattened"));
}
basic_json result;
@ -12506,7 +12506,7 @@ basic_json_parser_74:
{
if (not element.second.is_primitive())
{
JSON_THROW(std::domain_error("values in object must be primitive"));
JSON_THROW(type_error(315, "values in object must be primitive"));
}
// assign value to reference pointed to by JSON pointer; Note

6
src/json.hpp.re2c
View file

@ -11092,7 +11092,7 @@ class basic_json
*/
default:
{
JSON_THROW(std::domain_error("invalid value to unflatten"));
JSON_THROW(type_error(313, "invalid value to unflatten"));
}
}
}
@ -11529,7 +11529,7 @@ class basic_json
{
if (not value.is_object())
{
JSON_THROW(std::domain_error("only objects can be unflattened"));
JSON_THROW(type_error(314, "only objects can be unflattened"));
}
basic_json result;
@ -11539,7 +11539,7 @@ class basic_json
{
if (not element.second.is_primitive())
{
JSON_THROW(std::domain_error("values in object must be primitive"));
JSON_THROW(type_error(315, "values in object must be primitive"));
}
// assign value to reference pointed to by JSON pointer; Note

15
test/src/unit-json_pointer.cpp
View file

@ -358,17 +358,20 @@ TEST_CASE("JSON pointers")
CHECK(j_flatten.unflatten() == j);
// error for nonobjects
CHECK_THROWS_AS(json(1).unflatten(), std::domain_error);
CHECK_THROWS_WITH(json(1).unflatten(), "only objects can be unflattened");
CHECK_THROWS_AS(json(1).unflatten(), json::type_error);
CHECK_THROWS_WITH(json(1).unflatten(),
"[json.exception.type_error.314] only objects can be unflattened");
// error for nonprimitve values
CHECK_THROWS_AS(json({{"/1", {1, 2, 3}}}).unflatten(), std::domain_error);
CHECK_THROWS_WITH(json({{"/1", {1, 2, 3}}}).unflatten(), "values in object must be primitive");
CHECK_THROWS_AS(json({{"/1", {1, 2, 3}}}).unflatten(), json::type_error);
CHECK_THROWS_WITH(json({{"/1", {1, 2, 3}}}).unflatten(),
"[json.exception.type_error.315] values in object must be primitive");
// error for conflicting values
json j_error = {{"", 42}, {"/foo", 17}};
CHECK_THROWS_AS(j_error.unflatten(), std::domain_error);
CHECK_THROWS_WITH(j_error.unflatten(), "invalid value to unflatten");
CHECK_THROWS_AS(j_error.unflatten(), json::type_error);
CHECK_THROWS_WITH(j_error.unflatten(),
"[json.exception.type_error.313] invalid value to unflatten");
// explicit roundtrip check
CHECK(j.flatten().unflatten() == j);