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

🔨 added user-defined exceptions 203-204

Browse source
This commit is contained in:
Niels Lohmann 2017-03-03 13:38:14 +01:00
parent 9381f6c4da
commit 875b2da95d
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
5 changed files with 118 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/json.hpp
View file

@ -2418,7 +2418,7 @@ class basic_json
@throw invalid_iterator.201 if iterators are not compatible; that is, do
not belong to the same JSON value; example: `"iterators are not
compatible"`
@throw std::out_of_range if iterators are for a primitive type (number,
@throw invalid_iterator.204 if iterators are for a primitive type (number,
boolean, or string) where an out of range error can be detected easily;
example: `"iterators out of range"`
@throw std::bad_alloc if allocation for object, array, or string fails
@ -2460,7 +2460,7 @@ class basic_json
{
if (not first.m_it.primitive_iterator.is_begin() or not last.m_it.primitive_iterator.is_end())
{
JSON_THROW(std::out_of_range("iterators out of range"));
JSON_THROW(invalid_iterator(204, "iterators out of range"));
}
break;
}
@ -4507,9 +4507,9 @@ class basic_json
@throw std::domain_error if called on a `null` value; example: `"cannot
use erase() with null"`
@throw std::domain_error if called on iterators which does not belong to
the current JSON value; example: `"iterators do not fit current value"`
@throw std::out_of_range if called on a primitive type with invalid
@throw invalid_iterator.203 if called on iterators which does not belong
to the current JSON value; example: `"iterators do not fit current value"`
@throw invalid_iterator.204 if called on a primitive type with invalid
iterators (i.e., if `first != begin()` and `last != end()`); example:
`"iterators out of range"`
@ -4540,7 +4540,7 @@ class basic_json
// make sure iterator fits the current value
if (this != first.m_object or this != last.m_object)
{
JSON_THROW(std::domain_error("iterators do not fit current value"));
JSON_THROW(invalid_iterator(203, "iterators do not fit current value"));
}
IteratorType result = end();
@ -4555,7 +4555,7 @@ class basic_json
{
if (not first.m_it.primitive_iterator.is_begin() or not last.m_it.primitive_iterator.is_end())
{
JSON_THROW(std::out_of_range("iterators out of range"));
JSON_THROW(invalid_iterator(204, "iterators out of range"));
}
if (is_string())

14
src/json.hpp.re2c
View file

@ -2418,7 +2418,7 @@ class basic_json
@throw invalid_iterator.201 if iterators are not compatible; that is, do
not belong to the same JSON value; example: `"iterators are not
compatible"`
@throw std::out_of_range if iterators are for a primitive type (number,
@throw invalid_iterator.204 if iterators are for a primitive type (number,
boolean, or string) where an out of range error can be detected easily;
example: `"iterators out of range"`
@throw std::bad_alloc if allocation for object, array, or string fails
@ -2460,7 +2460,7 @@ class basic_json
{
if (not first.m_it.primitive_iterator.is_begin() or not last.m_it.primitive_iterator.is_end())
{
JSON_THROW(std::out_of_range("iterators out of range"));
JSON_THROW(invalid_iterator(204, "iterators out of range"));
}
break;
}
@ -4507,9 +4507,9 @@ class basic_json
@throw std::domain_error if called on a `null` value; example: `"cannot
use erase() with null"`
@throw std::domain_error if called on iterators which does not belong to
the current JSON value; example: `"iterators do not fit current value"`
@throw std::out_of_range if called on a primitive type with invalid
@throw invalid_iterator.203 if called on iterators which does not belong
to the current JSON value; example: `"iterators do not fit current value"`
@throw invalid_iterator.204 if called on a primitive type with invalid
iterators (i.e., if `first != begin()` and `last != end()`); example:
`"iterators out of range"`
@ -4540,7 +4540,7 @@ class basic_json
// make sure iterator fits the current value
if (this != first.m_object or this != last.m_object)
{
JSON_THROW(std::domain_error("iterators do not fit current value"));
JSON_THROW(invalid_iterator(203, "iterators do not fit current value"));
}
IteratorType result = end();
@ -4555,7 +4555,7 @@ class basic_json
{
if (not first.m_it.primitive_iterator.is_begin() or not last.m_it.primitive_iterator.is_end())
{
JSON_THROW(std::out_of_range("iterators out of range"));
JSON_THROW(invalid_iterator(204, "iterators out of range"));
}
if (is_string())