diff --git a/src/json.hpp b/src/json.hpp
index 284a6400..21601fcd 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -2415,8 +2415,9 @@ class basic_json
@pre Iterators @a first and @a last must be initialized. **This
precondition is enforced with an assertion.**
- @throw std::domain_error if iterators are not compatible; that is, do not
- belong to the same JSON value; example: `"iterators are not compatible"`
+ @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,
boolean, or string) where an out of range error can be detected easily;
example: `"iterators out of range"`
@@ -2442,7 +2443,7 @@ class basic_json
// make sure iterator fits the current value
if (first.m_object != last.m_object)
{
- JSON_THROW(std::domain_error("iterators are not compatible"));
+ JSON_THROW(invalid_iterator(201, "iterators are not compatible"));
}
// copy type from first iterator
@@ -4398,8 +4399,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 an iterator which does not belong to
- the current JSON value; example: `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if called on an iterator which does not belong
+ to the current JSON value; example: `"iterator does not fit current
+ value"`
@throw std::out_of_range if called on a primitive type with invalid
iterator (i.e., any iterator which is not `begin()`); example: `"iterator
out of range"`
@@ -4431,7 +4433,7 @@ class basic_json
// make sure iterator fits the current value
if (this != pos.m_object)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
IteratorType result = end();
@@ -5655,8 +5657,8 @@ class basic_json
@throw std::domain_error if called on JSON values other than arrays;
example: `"cannot use insert() with string"`
- @throw std::domain_error if @a pos is not an iterator of *this; example:
- `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
@complexity Constant plus linear in the distance between @a pos and end of
the container.
@@ -5673,7 +5675,7 @@ class basic_json
// check if iterator pos fits to this JSON value
if (pos.m_object != this)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
// insert to array and return iterator
@@ -5708,8 +5710,8 @@ class basic_json
@throw std::domain_error if called on JSON values other than arrays;
example: `"cannot use insert() with string"`
- @throw std::domain_error if @a pos is not an iterator of *this; example:
- `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
@complexity Linear in @a cnt plus linear in the distance between @a pos
and end of the container.
@@ -5726,7 +5728,7 @@ class basic_json
// check if iterator pos fits to this JSON value
if (pos.m_object != this)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
// insert to array and return iterator
@@ -5750,8 +5752,8 @@ class basic_json
@throw std::domain_error if called on JSON values other than arrays;
example: `"cannot use insert() with string"`
- @throw std::domain_error if @a pos is not an iterator of *this; example:
- `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
@throw std::domain_error if @a first and @a last do not belong to the same
JSON value; example: `"iterators do not fit"`
@throw std::domain_error if @a first or @a last are iterators into
@@ -5779,7 +5781,7 @@ class basic_json
// check if iterator pos fits to this JSON value
if (pos.m_object != this)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
// check if range iterators belong to the same JSON object
@@ -5813,8 +5815,8 @@ class basic_json
@throw std::domain_error if called on JSON values other than arrays;
example: `"cannot use insert() with string"`
- @throw std::domain_error if @a pos is not an iterator of *this; example:
- `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
@return iterator pointing to the first element inserted, or @a pos if
`ilist` is empty
@@ -5837,7 +5839,7 @@ class basic_json
// check if iterator pos fits to this JSON value
if (pos.m_object != this)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
// insert to array and return iterator
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index 55204136..72b073f0 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -2415,8 +2415,9 @@ class basic_json
@pre Iterators @a first and @a last must be initialized. **This
precondition is enforced with an assertion.**
- @throw std::domain_error if iterators are not compatible; that is, do not
- belong to the same JSON value; example: `"iterators are not compatible"`
+ @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,
boolean, or string) where an out of range error can be detected easily;
example: `"iterators out of range"`
@@ -2442,7 +2443,7 @@ class basic_json
// make sure iterator fits the current value
if (first.m_object != last.m_object)
{
- JSON_THROW(std::domain_error("iterators are not compatible"));
+ JSON_THROW(invalid_iterator(201, "iterators are not compatible"));
}
// copy type from first iterator
@@ -4398,8 +4399,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 an iterator which does not belong to
- the current JSON value; example: `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if called on an iterator which does not belong
+ to the current JSON value; example: `"iterator does not fit current
+ value"`
@throw std::out_of_range if called on a primitive type with invalid
iterator (i.e., any iterator which is not `begin()`); example: `"iterator
out of range"`
@@ -4431,7 +4433,7 @@ class basic_json
// make sure iterator fits the current value
if (this != pos.m_object)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
IteratorType result = end();
@@ -5655,8 +5657,8 @@ class basic_json
@throw std::domain_error if called on JSON values other than arrays;
example: `"cannot use insert() with string"`
- @throw std::domain_error if @a pos is not an iterator of *this; example:
- `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
@complexity Constant plus linear in the distance between @a pos and end of
the container.
@@ -5673,7 +5675,7 @@ class basic_json
// check if iterator pos fits to this JSON value
if (pos.m_object != this)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
// insert to array and return iterator
@@ -5708,8 +5710,8 @@ class basic_json
@throw std::domain_error if called on JSON values other than arrays;
example: `"cannot use insert() with string"`
- @throw std::domain_error if @a pos is not an iterator of *this; example:
- `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
@complexity Linear in @a cnt plus linear in the distance between @a pos
and end of the container.
@@ -5726,7 +5728,7 @@ class basic_json
// check if iterator pos fits to this JSON value
if (pos.m_object != this)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
// insert to array and return iterator
@@ -5750,8 +5752,8 @@ class basic_json
@throw std::domain_error if called on JSON values other than arrays;
example: `"cannot use insert() with string"`
- @throw std::domain_error if @a pos is not an iterator of *this; example:
- `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
@throw std::domain_error if @a first and @a last do not belong to the same
JSON value; example: `"iterators do not fit"`
@throw std::domain_error if @a first or @a last are iterators into
@@ -5779,7 +5781,7 @@ class basic_json
// check if iterator pos fits to this JSON value
if (pos.m_object != this)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
// check if range iterators belong to the same JSON object
@@ -5813,8 +5815,8 @@ class basic_json
@throw std::domain_error if called on JSON values other than arrays;
example: `"cannot use insert() with string"`
- @throw std::domain_error if @a pos is not an iterator of *this; example:
- `"iterator does not fit current value"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
@return iterator pointing to the first element inserted, or @a pos if
`ilist` is empty
@@ -5837,7 +5839,7 @@ class basic_json
// check if iterator pos fits to this JSON value
if (pos.m_object != this)
{
- JSON_THROW(std::domain_error("iterator does not fit current value"));
+ JSON_THROW(invalid_iterator(202, "iterator does not fit current value"));
}
// insert to array and return iterator
diff --git a/test/src/unit-constructor1.cpp b/test/src/unit-constructor1.cpp
index 9363f0ba..3179863e 100644
--- a/test/src/unit-constructor1.cpp
+++ b/test/src/unit-constructor1.cpp
@@ -1017,18 +1017,18 @@ TEST_CASE("constructors")
{
json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
- CHECK_THROWS_AS(json(jobject.begin(), jobject2.end()), std::domain_error);
- CHECK_THROWS_AS(json(jobject2.begin(), jobject.end()), std::domain_error);
- CHECK_THROWS_WITH(json(jobject.begin(), jobject2.end()), "iterators are not compatible");
- CHECK_THROWS_WITH(json(jobject2.begin(), jobject.end()), "iterators are not compatible");
+ CHECK_THROWS_AS(json(jobject.begin(), jobject2.end()), json::invalid_iterator);
+ CHECK_THROWS_AS(json(jobject2.begin(), jobject.end()), json::invalid_iterator);
+ CHECK_THROWS_WITH(json(jobject.begin(), jobject2.end()), "[json.exception.invalid_iterator.201] iterators are not compatible");
+ CHECK_THROWS_WITH(json(jobject2.begin(), jobject.end()), "[json.exception.invalid_iterator.201] iterators are not compatible");
}
{
json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
- CHECK_THROWS_AS(json(jobject.cbegin(), jobject2.cend()), std::domain_error);
- CHECK_THROWS_AS(json(jobject2.cbegin(), jobject.cend()), std::domain_error);
- CHECK_THROWS_WITH(json(jobject.cbegin(), jobject2.cend()), "iterators are not compatible");
- CHECK_THROWS_WITH(json(jobject2.cbegin(), jobject.cend()), "iterators are not compatible");
+ CHECK_THROWS_AS(json(jobject.cbegin(), jobject2.cend()), json::invalid_iterator);
+ CHECK_THROWS_AS(json(jobject2.cbegin(), jobject.cend()), json::invalid_iterator);
+ CHECK_THROWS_WITH(json(jobject.cbegin(), jobject2.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible");
+ CHECK_THROWS_WITH(json(jobject2.cbegin(), jobject.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible");
}
}
}
@@ -1082,18 +1082,18 @@ TEST_CASE("constructors")
{
json jarray = {1, 2, 3, 4};
json jarray2 = {2, 3, 4, 5};
- CHECK_THROWS_AS(json(jarray.begin(), jarray2.end()), std::domain_error);
- CHECK_THROWS_AS(json(jarray2.begin(), jarray.end()), std::domain_error);
- CHECK_THROWS_WITH(json(jarray.begin(), jarray2.end()), "iterators are not compatible");
- CHECK_THROWS_WITH(json(jarray2.begin(), jarray.end()), "iterators are not compatible");
+ CHECK_THROWS_AS(json(jarray.begin(), jarray2.end()), json::invalid_iterator);
+ CHECK_THROWS_AS(json(jarray2.begin(), jarray.end()), json::invalid_iterator);
+ CHECK_THROWS_WITH(json(jarray.begin(), jarray2.end()), "[json.exception.invalid_iterator.201] iterators are not compatible");
+ CHECK_THROWS_WITH(json(jarray2.begin(), jarray.end()), "[json.exception.invalid_iterator.201] iterators are not compatible");
}
{
json jarray = {1, 2, 3, 4};
json jarray2 = {2, 3, 4, 5};
- CHECK_THROWS_AS(json(jarray.cbegin(), jarray2.cend()), std::domain_error);
- CHECK_THROWS_AS(json(jarray2.cbegin(), jarray.cend()), std::domain_error);
- CHECK_THROWS_WITH(json(jarray.cbegin(), jarray2.cend()), "iterators are not compatible");
- CHECK_THROWS_WITH(json(jarray2.cbegin(), jarray.cend()), "iterators are not compatible");
+ CHECK_THROWS_AS(json(jarray.cbegin(), jarray2.cend()), json::invalid_iterator);
+ CHECK_THROWS_AS(json(jarray2.cbegin(), jarray.cend()), json::invalid_iterator);
+ CHECK_THROWS_WITH(json(jarray.cbegin(), jarray2.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible");
+ CHECK_THROWS_WITH(json(jarray2.cbegin(), jarray.cend()), "[json.exception.invalid_iterator.201] iterators are not compatible");
}
}
}
diff --git a/test/src/unit-element_access1.cpp b/test/src/unit-element_access1.cpp
index f0763c5d..d4ec045e 100644
--- a/test/src/unit-element_access1.cpp
+++ b/test/src/unit-element_access1.cpp
@@ -405,12 +405,13 @@ TEST_CASE("element access 1")
{
json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
json jarray2 = {"foo", "bar"};
- CHECK_THROWS_AS(jarray.erase(jarray2.begin()), std::domain_error);
+ CHECK_THROWS_AS(jarray.erase(jarray2.begin()), json::invalid_iterator);
CHECK_THROWS_AS(jarray.erase(jarray.begin(), jarray2.end()), std::domain_error);
CHECK_THROWS_AS(jarray.erase(jarray2.begin(), jarray.end()), std::domain_error);
CHECK_THROWS_AS(jarray.erase(jarray2.begin(), jarray2.end()), std::domain_error);
- CHECK_THROWS_WITH(jarray.erase(jarray2.begin()), "iterator does not fit current value");
+ CHECK_THROWS_WITH(jarray.erase(jarray2.begin()),
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
CHECK_THROWS_WITH(jarray.erase(jarray.begin(), jarray2.end()),
"iterators do not fit current value");
CHECK_THROWS_WITH(jarray.erase(jarray2.begin(), jarray.end()),
@@ -421,12 +422,13 @@ TEST_CASE("element access 1")
{
json jarray = {1, 1u, true, nullptr, "string", 42.23, json::object(), {1, 2, 3}};
json jarray2 = {"foo", "bar"};
- CHECK_THROWS_AS(jarray.erase(jarray2.cbegin()), std::domain_error);
+ CHECK_THROWS_AS(jarray.erase(jarray2.cbegin()), json::invalid_iterator);
CHECK_THROWS_AS(jarray.erase(jarray.cbegin(), jarray2.cend()), std::domain_error);
CHECK_THROWS_AS(jarray.erase(jarray2.cbegin(), jarray.cend()), std::domain_error);
CHECK_THROWS_AS(jarray.erase(jarray2.cbegin(), jarray2.cend()), std::domain_error);
- CHECK_THROWS_WITH(jarray.erase(jarray2.cbegin()), "iterator does not fit current value");
+ CHECK_THROWS_WITH(jarray.erase(jarray2.cbegin()),
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
CHECK_THROWS_WITH(jarray.erase(jarray.cbegin(), jarray2.cend()),
"iterators do not fit current value");
CHECK_THROWS_WITH(jarray.erase(jarray2.cbegin(), jarray.cend()),
diff --git a/test/src/unit-element_access2.cpp b/test/src/unit-element_access2.cpp
index 8e91e89d..d7e2cadc 100644
--- a/test/src/unit-element_access2.cpp
+++ b/test/src/unit-element_access2.cpp
@@ -685,11 +685,12 @@ TEST_CASE("element access 2")
{
json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
- CHECK_THROWS_AS(jobject.erase(jobject2.begin()), std::domain_error);
+ CHECK_THROWS_AS(jobject.erase(jobject2.begin()), json::invalid_iterator);
CHECK_THROWS_AS(jobject.erase(jobject.begin(), jobject2.end()), std::domain_error);
CHECK_THROWS_AS(jobject.erase(jobject2.begin(), jobject.end()), std::domain_error);
CHECK_THROWS_AS(jobject.erase(jobject2.begin(), jobject2.end()), std::domain_error);
- CHECK_THROWS_WITH(jobject.erase(jobject2.begin()), "iterator does not fit current value");
+ CHECK_THROWS_WITH(jobject.erase(jobject2.begin()),
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
CHECK_THROWS_WITH(jobject.erase(jobject.begin(), jobject2.end()),
"iterators do not fit current value");
CHECK_THROWS_WITH(jobject.erase(jobject2.begin(), jobject.end()),
@@ -700,11 +701,12 @@ TEST_CASE("element access 2")
{
json jobject = {{"a", "a"}, {"b", 1}, {"c", 17u}, {"d", false}, {"e", true}};
json jobject2 = {{"a", "a"}, {"b", 1}, {"c", 17u}};
- CHECK_THROWS_AS(jobject.erase(jobject2.cbegin()), std::domain_error);
+ CHECK_THROWS_AS(jobject.erase(jobject2.cbegin()), json::invalid_iterator);
CHECK_THROWS_AS(jobject.erase(jobject.cbegin(), jobject2.cend()), std::domain_error);
CHECK_THROWS_AS(jobject.erase(jobject2.cbegin(), jobject.cend()), std::domain_error);
CHECK_THROWS_AS(jobject.erase(jobject2.cbegin(), jobject2.cend()), std::domain_error);
- CHECK_THROWS_WITH(jobject.erase(jobject2.cbegin()), "iterator does not fit current value");
+ CHECK_THROWS_WITH(jobject.erase(jobject2.cbegin()),
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
CHECK_THROWS_WITH(jobject.erase(jobject.cbegin(), jobject2.cend()),
"iterators do not fit current value");
CHECK_THROWS_WITH(jobject.erase(jobject2.cbegin(), jobject.cend()),
diff --git a/test/src/unit-modifiers.cpp b/test/src/unit-modifiers.cpp
index 0edc9a12..00521535 100644
--- a/test/src/unit-modifiers.cpp
+++ b/test/src/unit-modifiers.cpp
@@ -662,22 +662,22 @@ TEST_CASE("modifiers")
// pass iterator to a different array
json j_another_array = {1, 2};
json j_yet_another_array = {"first", "second"};
- CHECK_THROWS_AS(j_array.insert(j_another_array.end(), 10), std::domain_error);
- CHECK_THROWS_AS(j_array.insert(j_another_array.end(), j_value), std::domain_error);
- CHECK_THROWS_AS(j_array.insert(j_another_array.end(), 10, 11), std::domain_error);
- CHECK_THROWS_AS(j_array.insert(j_another_array.end(), j_yet_another_array.begin(),
- j_yet_another_array.end()), std::domain_error);
- CHECK_THROWS_AS(j_array.insert(j_another_array.end(), {1, 2, 3, 4}), std::domain_error);
+ CHECK_THROWS_AS(j_array.insert(j_another_array.end(), 10), json::invalid_iterator);
+ CHECK_THROWS_AS(j_array.insert(j_another_array.end(), j_value), json::invalid_iterator);
+ CHECK_THROWS_AS(j_array.insert(j_another_array.end(), 10, 11), json::invalid_iterator);
+ CHECK_THROWS_AS(j_array.insert(j_another_array.end(), j_yet_another_array.begin(), j_yet_another_array.end()), json::invalid_iterator);
+ CHECK_THROWS_AS(j_array.insert(j_another_array.end(), {1, 2, 3, 4}), json::invalid_iterator);
- CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), 10), "iterator does not fit current value");
+ CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), 10),
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), j_value),
- "iterator does not fit current value");
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), 10, 11),
- "iterator does not fit current value");
- CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), j_yet_another_array.begin(),
- j_yet_another_array.end()), "iterator does not fit current value");
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
+ CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), j_yet_another_array.begin(), j_yet_another_array.end()),
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
CHECK_THROWS_WITH(j_array.insert(j_another_array.end(), {1, 2, 3, 4}),
- "iterator does not fit current value");
+ "[json.exception.invalid_iterator.202] iterator does not fit current value");
}
SECTION("non-array type")