🔨 added user-defined exception #493

Replaced old std::invalid_argument exception by parse_error.111 to have unified exceptions in case of input stream errors.

🔨 added user-defined exception #493
1de80e8a · Niels Lohmann · 63c2c62f · 1de80e8a · 1de80e8a · 1de80e8a
Unverified Commit 1de80e8a authored Mar 14, 2017 by Niels Lohmann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

json.hpp src/json.hpp +1 -1

json.hpp.re2c src/json.hpp.re2c +1 -1

unit-regression.cpp test/src/unit-regression.cpp +4 -2

No files found.
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -11334,7 +11334,7 @@ basic_json_parser_74:
                // check if stream is still good
                if (m_stream->fail())
                {
-                    JSON_THROW(std::invalid_argument("stream error"));
+                    JSON_THROW(parse_error(111, 0, "bad input stream"));
                }

                std::getline(*m_stream, m_line_buffer_tmp, '\n');

--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -10367,7 +10367,7 @@ class basic_json
                // check if stream is still good
                if (m_stream->fail())
                {
-                    JSON_THROW(std::invalid_argument("stream error"));
+                    JSON_THROW(parse_error(111, 0, "bad input stream"));
                }

                std::getline(*m_stream, m_line_buffer_tmp, '\n');

--- a/test/src/unit-regression.cpp
+++ b/test/src/unit-regression.cpp
@@ -924,7 +924,8 @@ TEST_CASE("regression tests")

            l.m_stream->setstate(std::ios_base::failbit);

-            CHECK_THROWS_AS(l.fill_line_buffer(), std::invalid_argument);
+            CHECK_THROWS_AS(l.fill_line_buffer(), json::parse_error);
+            CHECK_THROWS_WITH(l.fill_line_buffer(), "[json.exception.parse_error.111] parse error: bad input stream");
        }

        SECTION("setting badbit")
@@ -938,7 +939,8 @@ TEST_CASE("regression tests")

            l.m_stream->setstate(std::ios_base::badbit);

-            CHECK_THROWS_AS(l.fill_line_buffer(), std::invalid_argument);
+            CHECK_THROWS_AS(l.fill_line_buffer(), json::parse_error);
+            CHECK_THROWS_WITH(l.fill_line_buffer(), "[json.exception.parse_error.111] parse error: bad input stream");
        }
    }