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

🔨 added user-defined exceptions 301

Browse Source
This commit is contained in:
Niels Lohmann 2017-03-05 18:40:09 +01:00
parent 0c40c8e3be
commit 068c7acda9
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/json.hpp
View File

@ -2223,8 +2223,8 @@ class basic_json
value_t::array and @ref value_t::object are valid); when @a type_deduction value_t::array and @ref value_t::object are valid); when @a type_deduction
is set to `true`, this parameter has no effect is set to `true`, this parameter has no effect
@throw std::domain_error if @a type_deduction is `false`, @a manual_type @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
is `value_t::object`, but @a init contains an element which is not a pair `value_t::object`, but @a init contains an element which is not a pair
whose first element is a string; example: `"cannot create object from whose first element is a string; example: `"cannot create object from
initializer list"` initializer list"`
@ -2264,7 +2264,7 @@ class basic_json
// if object is wanted but impossible, throw an exception // if object is wanted but impossible, throw an exception
if (manual_type == value_t::object and not is_an_object) if (manual_type == value_t::object and not is_an_object)
{ {
JSON_THROW(std::domain_error("cannot create object from initializer list")); JSON_THROW(type_error(301, "cannot create object from initializer list"));
} }
} }
@ -2347,7 +2347,7 @@ class basic_json
@return JSON object value @return JSON object value
@throw std::domain_error if @a init is not a pair whose first elements are @throw type_error.301 if @a init is not a pair whose first elements are
strings; thrown by strings; thrown by
@ref basic_json(std::initializer_list<basic_json>, bool, value_t) @ref basic_json(std::initializer_list<basic_json>, bool, value_t)

8
src/json.hpp.re2c
View File

@ -2223,8 +2223,8 @@ class basic_json
value_t::array and @ref value_t::object are valid); when @a type_deduction value_t::array and @ref value_t::object are valid); when @a type_deduction
is set to `true`, this parameter has no effect is set to `true`, this parameter has no effect
@throw std::domain_error if @a type_deduction is `false`, @a manual_type @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
is `value_t::object`, but @a init contains an element which is not a pair `value_t::object`, but @a init contains an element which is not a pair
whose first element is a string; example: `"cannot create object from whose first element is a string; example: `"cannot create object from
initializer list"` initializer list"`
@ -2264,7 +2264,7 @@ class basic_json
// if object is wanted but impossible, throw an exception // if object is wanted but impossible, throw an exception
if (manual_type == value_t::object and not is_an_object) if (manual_type == value_t::object and not is_an_object)
{ {
JSON_THROW(std::domain_error("cannot create object from initializer list")); JSON_THROW(type_error(301, "cannot create object from initializer list"));
} }
} }
@ -2347,7 +2347,7 @@ class basic_json
@return JSON object value @return JSON object value
@throw std::domain_error if @a init is not a pair whose first elements are @throw type_error.301 if @a init is not a pair whose first elements are
strings; thrown by strings; thrown by
@ref basic_json(std::initializer_list<basic_json>, bool, value_t) @ref basic_json(std::initializer_list<basic_json>, bool, value_t)

4
test/src/unit-constructor1.cpp
View File

@ -943,9 +943,9 @@ TEST_CASE("constructors")
SECTION("object with error") SECTION("object with error")
{ {
CHECK_THROWS_AS(json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 }), CHECK_THROWS_AS(json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 }),
std::logic_error); json::type_error);
CHECK_THROWS_WITH(json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 }), CHECK_THROWS_WITH(json::object({ {"one", 1}, {"two", 1u}, {"three", 2.2}, {"four", false}, 13 }),
"cannot create object from initializer list"); "[json.exception.type_error.301] cannot create object from initializer list");
} }
SECTION("empty array") SECTION("empty array")