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

🔨 added user-defined exception 111

Browse source
This commit is contained in:
Niels Lohmann 2017-03-06 22:37:46 +01:00
parent 21ec0e7806
commit 5407333224
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/json.hpp
View file

@ -173,7 +173,7 @@ json.exception.[parse_error](@ref parse_error).107 | "parse error: JSON pointer
json.exception.[parse_error](@ref parse_error).108 | "parse error: escape character '~' must be followed with '0' or '1'" | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
json.exception.[parse_error](@ref parse_error).109 | "parse error: array index 'one' is not a number" | A JSON Pointer array index must be a number.
json.exception.[parse_error](@ref parse_error).110 | "parse error at 1: cannot read 2 bytes from vector" | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
json.exception.[parse_error](@ref parse_error).111 | "parse error: bad input stream" | Parsing CBOR or MessagePack from an input stream where the `badbit` or `failbit` is set.
@since version 3.0.0
*/
@ -9889,7 +9889,7 @@ class basic_json
// immediately abort if stream is erroneous
if (s.fail())
{
JSON_THROW(std::invalid_argument("stream error"));
JSON_THROW(parse_error(111, 0, "bad input stream"));
}
// fill buffer

4
src/json.hpp.re2c
View file

@ -173,7 +173,7 @@ json.exception.[parse_error](@ref parse_error).107 | "parse error: JSON pointer
json.exception.[parse_error](@ref parse_error).108 | "parse error: escape character '~' must be followed with '0' or '1'" | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
json.exception.[parse_error](@ref parse_error).109 | "parse error: array index 'one' is not a number" | A JSON Pointer array index must be a number.
json.exception.[parse_error](@ref parse_error).110 | "parse error at 1: cannot read 2 bytes from vector" | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
json.exception.[parse_error](@ref parse_error).111 | "parse error: bad input stream" | Parsing CBOR or MessagePack from an input stream where the `badbit` or `failbit` is set.
@since version 3.0.0
*/
@ -9889,7 +9889,7 @@ class basic_json
// immediately abort if stream is erroneous
if (s.fail())
{
JSON_THROW(std::invalid_argument("stream error"));
JSON_THROW(parse_error(111, 0, "bad input stream"));
}
// fill buffer

3
test/src/unit-regression.cpp
View file

@ -565,7 +565,8 @@ TEST_CASE("regression tests")
SECTION("issue #366 - json::parse on failed stream gets stuck")
{
std::ifstream f("file_not_found.json");
CHECK_THROWS_AS(json::parse(f), std::invalid_argument);
CHECK_THROWS_AS(json::parse(f), json::parse_error);
CHECK_THROWS_WITH(json::parse(f), "[json.exception.parse_error.111] parse error: bad input stream");
}
SECTION("issue #367 - calling stream at EOF")