From f06c8fd8e310ad57087142d395ec1ea5523e2c49 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Fri, 14 Sep 2018 22:58:22 +0200 Subject: [PATCH 01/77] BSON: serialization of non-objects is not supported --- include/nlohmann/detail/exceptions.hpp | 1 + .../nlohmann/detail/input/binary_reader.hpp | 28 ++++ .../nlohmann/detail/input/input_adapters.hpp | 2 +- .../nlohmann/detail/output/binary_writer.hpp | 55 +++++++ include/nlohmann/json.hpp | 48 +++++++ single_include/nlohmann/json.hpp | 134 +++++++++++++++++- test/src/unit-bson.cpp | 70 +++++++++ 7 files changed, 336 insertions(+), 2 deletions(-) create mode 100644 test/src/unit-bson.cpp diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index b73d7b1f..274a88c7 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -220,6 +220,7 @@ json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers. json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive. json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. | +json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) | @liveexample{The following code shows how a `type_error` exception can be caught.,type_error} diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 05ab36f3..9f684273 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -80,6 +80,10 @@ class binary_reader result = parse_ubjson_internal(); break; + case input_format_t::bson: + result = parse_bson_internal(); + break; + // LCOV_EXCL_START default: assert(false); @@ -120,6 +124,30 @@ class binary_reader } private: + + bool parse_bson_internal() + { + int docLen = 0; + int byte; + for (int i = 0; i < 4; ++i) + { + byte = get(); + if (JSON_UNLIKELY(current == std::char_traits::eof())) + { + if (i == 1) + { + return sax->boolean(docLen != 0x00); + } + return false; + } + docLen |= static_cast(byte) << 8 * i; + } + + //sax->null(); + get(); + return true; + } + /*! @param[in] get_char whether a new character should be retrieved from the input (true, default) or whether the last read diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp index c2a20ab7..a877984e 100644 --- a/include/nlohmann/detail/input/input_adapters.hpp +++ b/include/nlohmann/detail/input/input_adapters.hpp @@ -18,7 +18,7 @@ namespace nlohmann namespace detail { /// the supported input formats -enum class input_format_t { json, cbor, msgpack, ubjson }; +enum class input_format_t { json, cbor, msgpack, ubjson, bson }; //////////////////// // input adapters // diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 71e5ec81..f58213f5 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -676,6 +676,37 @@ class binary_writer } } + + /*! + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson_object(const BasicJsonType& j) + { + assert(j.type() == value_t::object); + + } + + /*! + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson(const BasicJsonType& j) + { + switch (j.type()) + { + default: + JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); + break; + case value_t::discarded: + break; + case value_t::object: + write_bson_object(j); + break; + } + } + + private: /* @brief write a number to output input @@ -704,6 +735,30 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } + /* + @brief write a number to output in little endian format + + @param[in] n number of type @a NumberType + @tparam NumberType the type of the number + */ + template + void write_number_little_endian(const NumberType n) + { + // step 1: write number to array of length NumberType + std::array vec; + std::memcpy(vec.data(), &n, sizeof(NumberType)); + + // step 2: write array to output (with possible reordering) + if (!is_little_endian) + { + // reverse byte order prior to conversion if necessary + std::reverse(vec.begin(), vec.end()); + } + + oa->write_characters(vec.data(), sizeof(NumberType)); + } + + // UBJSON: write number (floating point) template::value, int>::type = 0> diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index ee78c1c1..8b6a0170 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -6590,6 +6590,26 @@ class basic_json binary_writer(o).write_ubjson(j, use_size, use_type); } + + + static std::vector to_bson(const basic_json& j) + { + std::vector result; + to_bson(j, result); + return result; + } + + static void to_bson(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_bson(j); + } + + static void to_bson(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_bson(j); + } + + /*! @brief create a JSON value from an input in CBOR format @@ -6897,6 +6917,34 @@ class basic_json return res ? result : basic_json(value_t::discarded); } + + + + + static basic_json from_bson(detail::input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + template::value, int> = 0> + static basic_json from_bson(A1 && a1, A2 && a2, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + const bool res = binary_reader(detail::input_adapter(std::forward(a1), std::forward(a2))).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + + /// @} ////////////////////////// diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 69e4bddc..606a3574 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -819,6 +819,7 @@ json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers. json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive. json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. | +json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) | @liveexample{The following code shows how a `type_error` exception can be caught.,type_error} @@ -1882,7 +1883,7 @@ namespace nlohmann namespace detail { /// the supported input formats -enum class input_format_t { json, cbor, msgpack, ubjson }; +enum class input_format_t { json, cbor, msgpack, ubjson, bson }; //////////////////// // input adapters // @@ -6020,6 +6021,10 @@ class binary_reader result = parse_ubjson_internal(); break; + case input_format_t::bson: + result = parse_bson_internal(); + break; + // LCOV_EXCL_START default: assert(false); @@ -6060,6 +6065,30 @@ class binary_reader } private: + + bool parse_bson_internal() + { + int docLen = 0; + int byte; + for (int i = 0; i < 4; ++i) + { + byte = get(); + if (JSON_UNLIKELY(current == std::char_traits::eof())) + { + if (i == 1) + { + return sax->boolean(docLen != 0x00); + } + return false; + } + docLen |= static_cast(byte) << 8 * i; + } + + //sax->null(); + get(); + return true; + } + /*! @param[in] get_char whether a new character should be retrieved from the input (true, default) or whether the last read @@ -8317,6 +8346,37 @@ class binary_writer } } + + /*! + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson_object(const BasicJsonType& j) + { + assert(j.type() == value_t::object); + + } + + /*! + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson(const BasicJsonType& j) + { + switch (j.type()) + { + default: + JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); + break; + case value_t::discarded: + break; + case value_t::object: + write_bson_object(j); + break; + } + } + + private: /* @brief write a number to output input @@ -8345,6 +8405,30 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } + /* + @brief write a number to output in little endian format + + @param[in] n number of type @a NumberType + @tparam NumberType the type of the number + */ + template + void write_number_little_endian(const NumberType n) + { + // step 1: write number to array of length NumberType + std::array vec; + std::memcpy(vec.data(), &n, sizeof(NumberType)); + + // step 2: write array to output (with possible reordering) + if (!is_little_endian) + { + // reverse byte order prior to conversion if necessary + std::reverse(vec.begin(), vec.end()); + } + + oa->write_characters(vec.data(), sizeof(NumberType)); + } + + // UBJSON: write number (floating point) template::value, int>::type = 0> @@ -17663,6 +17747,26 @@ class basic_json binary_writer(o).write_ubjson(j, use_size, use_type); } + + + static std::vector to_bson(const basic_json& j) + { + std::vector result; + to_bson(j, result); + return result; + } + + static void to_bson(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_bson(j); + } + + static void to_bson(const basic_json& j, detail::output_adapter o) + { + binary_writer(o).write_bson(j); + } + + /*! @brief create a JSON value from an input in CBOR format @@ -17970,6 +18074,34 @@ class basic_json return res ? result : basic_json(value_t::discarded); } + + + + + static basic_json from_bson(detail::input_adapter&& i, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + template::value, int> = 0> + static basic_json from_bson(A1 && a1, A2 && a2, + const bool strict = true, + const bool allow_exceptions = true) + { + basic_json result; + detail::json_sax_dom_parser sdp(result, allow_exceptions); + const bool res = binary_reader(detail::input_adapter(std::forward(a1), std::forward(a2))).sax_parse(input_format_t::bson, &sdp, strict); + return res ? result : basic_json(value_t::discarded); + } + + + /// @} ////////////////////////// diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp new file mode 100644 index 00000000..4e17f233 --- /dev/null +++ b/test/src/unit-bson.cpp @@ -0,0 +1,70 @@ +/* + __ _____ _____ _____ + __| | __| | | | JSON for Modern C++ (test suite) +| | |__ | | | | | | version 3.2.0 +|_____|_____|_____|_|___| https://github.com/nlohmann/json + +Licensed under the MIT License . +SPDX-License-Identifier: MIT +Copyright (c) 2013-2018 Niels Lohmann . + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#include "catch.hpp" + +#include +using nlohmann::json; + +#include + +TEST_CASE("BSON") +{ + SECTION("individual values") + { + SECTION("discarded") + { + // discarded values are not serialized + json j = json::value_t::discarded; + const auto result = json::to_bson(j); + CHECK(result.empty()); + } + + SECTION("null") + { + json j = nullptr; + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + } + + SECTION("boolean") + { + SECTION("true") + { + json j = true; + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + } + + SECTION("false") + { + json j = false; + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + } + } + } +} From 5f5836ce1c7a2fc10a85bab058cf1dd0bc23d9a8 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 00:43:39 +0200 Subject: [PATCH 02/77] BSON: Support empty objects --- .../nlohmann/detail/input/binary_reader.hpp | 52 +++++++++++++----- .../nlohmann/detail/output/binary_writer.hpp | 3 +- single_include/nlohmann/json.hpp | 55 +++++++++++++------ test/src/unit-bson.cpp | 47 +++++++++++++++- 4 files changed, 124 insertions(+), 33 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 9f684273..9b00cc49 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -127,25 +127,18 @@ class binary_reader bool parse_bson_internal() { - int docLen = 0; - int byte; - for (int i = 0; i < 4; ++i) + std::int32_t documentSize; + get_number_little_endian(documentSize); + + if (not JSON_UNLIKELY(sax->start_object(documentSize - 5))) { - byte = get(); - if (JSON_UNLIKELY(current == std::char_traits::eof())) - { - if (i == 1) - { - return sax->boolean(docLen != 0x00); - } - return false; - } - docLen |= static_cast(byte) << 8 * i; + return false; } - //sax->null(); + const auto result = sax->end_object(); + get(); - return true; + return result; } /*! @@ -927,6 +920,35 @@ class binary_reader return true; } + template + bool get_number_little_endian(NumberType& result) + { + // step 1: read input into array with system's byte order + std::array vec; + for (std::size_t i = 0; i < sizeof(NumberType); ++i) + { + get(); + if (JSON_UNLIKELY(not unexpect_eof())) + { + return false; + } + + // reverse byte order prior to conversion if necessary + if (!is_little_endian) + { + vec[sizeof(NumberType) - i - 1] = static_cast(current); + } + else + { + vec[i] = static_cast(current); // LCOV_EXCL_LINE + } + } + + // step 2: convert array into number of type T and return + std::memcpy(&result, vec.data(), sizeof(NumberType)); + return true; + } + /*! @brief create a string by reading characters from the input diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index f58213f5..4b9a1343 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -684,7 +684,8 @@ class binary_writer void write_bson_object(const BasicJsonType& j) { assert(j.type() == value_t::object); - + write_number_little_endian(5); + oa->write_character(static_cast(0x00)); } /*! diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 606a3574..a68c64a9 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6068,25 +6068,18 @@ class binary_reader bool parse_bson_internal() { - int docLen = 0; - int byte; - for (int i = 0; i < 4; ++i) + std::int32_t documentSize; + get_number_little_endian(documentSize); + + if (not JSON_UNLIKELY(sax->start_object(documentSize - 5))) { - byte = get(); - if (JSON_UNLIKELY(current == std::char_traits::eof())) - { - if (i == 1) - { - return sax->boolean(docLen != 0x00); - } - return false; - } - docLen |= static_cast(byte) << 8 * i; + return false; } - //sax->null(); + const auto result = sax->end_object(); + get(); - return true; + return result; } /*! @@ -6868,6 +6861,35 @@ class binary_reader return true; } + template + bool get_number_little_endian(NumberType& result) + { + // step 1: read input into array with system's byte order + std::array vec; + for (std::size_t i = 0; i < sizeof(NumberType); ++i) + { + get(); + if (JSON_UNLIKELY(not unexpect_eof())) + { + return false; + } + + // reverse byte order prior to conversion if necessary + if (!is_little_endian) + { + vec[sizeof(NumberType) - i - 1] = static_cast(current); + } + else + { + vec[i] = static_cast(current); // LCOV_EXCL_LINE + } + } + + // step 2: convert array into number of type T and return + std::memcpy(&result, vec.data(), sizeof(NumberType)); + return true; + } + /*! @brief create a string by reading characters from the input @@ -8354,7 +8376,8 @@ class binary_writer void write_bson_object(const BasicJsonType& j) { assert(j.type() == value_t::object); - + write_number_little_endian(5); + oa->write_character(static_cast(0x00)); } /*! diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 4e17f233..78a30139 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -36,7 +36,7 @@ using nlohmann::json; TEST_CASE("BSON") { - SECTION("individual values") + SECTION("individual values not supported") { SECTION("discarded") { @@ -66,5 +66,50 @@ TEST_CASE("BSON") REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); } } + + SECTION("number") + { + json j = 42; + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + } + + SECTION("float") + { + json j = 4.2; + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + } + + SECTION("string") + { + json j = "not supported"; + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + } + + SECTION("array") + { + json j = std::vector {1, 2, 3, 4, 5, 6, 7}; + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + } + } + + SECTION("objects") + { + SECTION("empty object") + { + json j = json::object(); + std::vector expected = + { + 0x05, 0x00, 0x00, 0x00, // size (little endian) + // no entries + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } } } From 9a0dddc5d2536d6d1960a2fb89027e3849794306 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 03:08:50 +0200 Subject: [PATCH 03/77] BSON: Object with single boolean --- .../nlohmann/detail/input/binary_reader.hpp | 60 +++++++- .../nlohmann/detail/output/binary_writer.hpp | 44 +++++- .../detail/output/output_adapters.hpp | 43 ++++++ single_include/nlohmann/json.hpp | 141 +++++++++++++++++- test/src/unit-bson.cpp | 48 ++++++ 5 files changed, 330 insertions(+), 6 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 9b00cc49..54833cc3 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -125,19 +125,75 @@ class binary_reader private: + template + OutputIt generate_until(OutputIt&& d_first, UnaryPredicate&& pred, Gen&& gen) + { + for (auto x = gen(); !pred(x); x = gen()) + { + *d_first++ = x; + } + + return d_first; + } + + /*! + @param[in] len the length of the array or std::size_t(-1) for an + array of indefinite size + @return whether array creation completed + */ + bool get_bson_str(string_t& result) + { + bool success = true; + generate_until(std::back_inserter(result), [](char c) + { + return c == 0x00; + }, [this, &success] + { + get(); + if (JSON_UNLIKELY(unexpect_eof())) + { + success = false; + } + return static_cast(current); + }); + return success; + } + + bool parse_bson_internal() { std::int32_t documentSize; get_number_little_endian(documentSize); - if (not JSON_UNLIKELY(sax->start_object(documentSize - 5))) + if (not JSON_UNLIKELY(sax->start_object(-1))) { return false; } - const auto result = sax->end_object(); + while (auto entry_type = get()) + { + switch (entry_type) + { + case 0x01: + { + string_t key; + get_bson_str(key); + sax->key(key); + sax->boolean(static_cast(get())); + } break; + case 0x08: + { + string_t key; + get_bson_str(key); + sax->key(key); + sax->boolean(static_cast(get())); + } break; + } + } get(); + const auto result = sax->end_object(); + return result; } diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 4b9a1343..98e6104b 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -677,6 +677,16 @@ class binary_writer } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x08)); // boolean + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + oa->write_character(j.m_value.boolean ? static_cast(0x01) : static_cast(0x00)); + return /*id*/ 1ul + name.size() + 1u + /*boolean value*/ 1u; + } + /*! @param[in] j JSON value to serialize @pre j.type() == value_t::object @@ -684,8 +694,16 @@ class binary_writer void write_bson_object(const BasicJsonType& j) { assert(j.type() == value_t::object); - write_number_little_endian(5); + auto document_size_offset = oa->reserve_characters(4ul); + std::int32_t document_size = 5ul; + + for (const auto& el : *j.m_value.object) + { + document_size += write_bson_object_entry(el.first, el.second); + } + oa->write_character(static_cast(0x00)); + write_number_little_endian_at(document_size_offset, document_size); } /*! @@ -759,6 +777,30 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } + /* + @brief write a number to output in little endian format + + @param[in] offset The offset where to start writing + @param[in] n number of type @a NumberType + @tparam NumberType the type of the number + */ + template + void write_number_little_endian_at(std::size_t offset, const NumberType n) + { + // step 1: write number to array of length NumberType + std::array vec; + std::memcpy(vec.data(), &n, sizeof(NumberType)); + + // step 2: write array to output (with possible reordering) + if (!is_little_endian) + { + // reverse byte order prior to conversion if necessary + std::reverse(vec.begin(), vec.end()); + } + + oa->write_characters_at(offset, vec.data(), sizeof(NumberType)); + } + // UBJSON: write number (floating point) template struct output_adapter_protocol { virtual void write_character(CharType c) = 0; virtual void write_characters(const CharType* s, std::size_t length) = 0; + virtual void write_characters_at(std::size_t position, const CharType* s, std::size_t length) = 0; + virtual std::size_t reserve_characters(std::size_t length) = 0; virtual ~output_adapter_protocol() = default; }; @@ -42,6 +44,18 @@ class output_vector_adapter : public output_adapter_protocol std::copy(s, s + length, std::back_inserter(v)); } + void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override + { + std::copy(s, s + length, std::begin(v) + position); + } + + std::size_t reserve_characters(std::size_t length) override + { + const auto position = v.size(); + std::fill_n(std::back_inserter(v), length, static_cast(0x00)); + return position; + } + private: std::vector& v; }; @@ -63,6 +77,22 @@ class output_stream_adapter : public output_adapter_protocol stream.write(s, static_cast(length)); } + void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override + { + const auto orig_offset = stream.tellp(); + stream.seekp(static_cast::pos_type>(position)); + stream.write(s, static_cast(length)); + stream.seekp(orig_offset); + } + + std::size_t reserve_characters(std::size_t length) override + { + const auto position = stream.tellp(); + std::vector empty(length, static_cast(0)); + stream.write(empty.data(), length); + return static_cast(position); + } + private: std::basic_ostream& stream; }; @@ -84,6 +114,19 @@ class output_string_adapter : public output_adapter_protocol str.append(s, length); } + void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override + { + std::copy(s, s + length, std::begin(str) + position); + } + + std::size_t reserve_characters(std::size_t length) override + { + const auto position = str.size(); + std::fill_n(std::back_inserter(str), length, static_cast(0x00)); + return position; + } + + private: StringType& str; }; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index a68c64a9..6b81d354 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -5838,6 +5838,8 @@ template struct output_adapter_protocol { virtual void write_character(CharType c) = 0; virtual void write_characters(const CharType* s, std::size_t length) = 0; + virtual void write_characters_at(std::size_t position, const CharType* s, std::size_t length) = 0; + virtual std::size_t reserve_characters(std::size_t length) = 0; virtual ~output_adapter_protocol() = default; }; @@ -5862,6 +5864,18 @@ class output_vector_adapter : public output_adapter_protocol std::copy(s, s + length, std::back_inserter(v)); } + void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override + { + std::copy(s, s + length, std::begin(v) + position); + } + + std::size_t reserve_characters(std::size_t length) override + { + const auto position = v.size(); + std::fill_n(std::back_inserter(v), length, static_cast(0x00)); + return position; + } + private: std::vector& v; }; @@ -5883,6 +5897,22 @@ class output_stream_adapter : public output_adapter_protocol stream.write(s, static_cast(length)); } + void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override + { + const auto orig_offset = stream.tellp(); + stream.seekp(static_cast::pos_type>(position)); + stream.write(s, static_cast(length)); + stream.seekp(orig_offset); + } + + std::size_t reserve_characters(std::size_t length) override + { + const auto position = stream.tellp(); + std::vector empty(length, static_cast(0)); + stream.write(empty.data(), length); + return static_cast(position); + } + private: std::basic_ostream& stream; }; @@ -5904,6 +5934,19 @@ class output_string_adapter : public output_adapter_protocol str.append(s, length); } + void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override + { + std::copy(s, s + length, std::begin(str) + position); + } + + std::size_t reserve_characters(std::size_t length) override + { + const auto position = str.size(); + std::fill_n(std::back_inserter(str), length, static_cast(0x00)); + return position; + } + + private: StringType& str; }; @@ -6066,19 +6109,69 @@ class binary_reader private: + template + OutputIt generate_until(OutputIt&& d_first, UnaryPredicate&& pred, Gen&& gen) + { + for (auto x = gen(); !pred(x); x = gen()) + { + *d_first++ = x; + } + + return d_first; + } + + /*! + @param[in] len the length of the array or std::size_t(-1) for an + array of indefinite size + @return whether array creation completed + */ + bool get_bson_str(string_t& result) + { + bool success = true; + generate_until(std::back_inserter(result), [](char c) + { + return c == 0x00; + }, [this, &success] + { + get(); + if (JSON_UNLIKELY(unexpect_eof())) + { + success = false; + } + return static_cast(current); + }); + return success; + } + + bool parse_bson_internal() { std::int32_t documentSize; get_number_little_endian(documentSize); - if (not JSON_UNLIKELY(sax->start_object(documentSize - 5))) + if (not JSON_UNLIKELY(sax->start_object(-1))) { return false; } - const auto result = sax->end_object(); + while (auto entry_type = get()) + { + switch (entry_type) + { + case 0x08: + { + string_t key; + get_bson_str(key); + sax->key(key); + sax->boolean(static_cast(get())); + } + break; + } + } get(); + const auto result = sax->end_object(); + return result; } @@ -8369,6 +8462,16 @@ class binary_writer } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x08)); // boolean + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + oa->write_character(j.m_value.boolean ? static_cast(0x01) : static_cast(0x00)); + return /*id*/ 1ul + name.size() + 1u + /*boolean value*/ 1u; + } + /*! @param[in] j JSON value to serialize @pre j.type() == value_t::object @@ -8376,8 +8479,16 @@ class binary_writer void write_bson_object(const BasicJsonType& j) { assert(j.type() == value_t::object); - write_number_little_endian(5); + auto document_size_offset = oa->reserve_characters(4ul); + std::int32_t document_size = 5ul; + + for (const auto& el : *j.m_value.object) + { + document_size += write_bson_object_entry(el.first, el.second); + } + oa->write_character(static_cast(0x00)); + write_number_little_endian_at(document_size_offset, document_size); } /*! @@ -8451,6 +8562,30 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } + /* + @brief write a number to output in little endian format + + @param[in] offset The offset where to start writing + @param[in] n number of type @a NumberType + @tparam NumberType the type of the number + */ + template + void write_number_little_endian_at(std::size_t offset, const NumberType n) + { + // step 1: write number to array of length NumberType + std::array vec; + std::memcpy(vec.data(), &n, sizeof(NumberType)); + + // step 2: write array to output (with possible reordering) + if (!is_little_endian) + { + // reverse byte order prior to conversion if necessary + std::reverse(vec.begin(), vec.end()); + } + + oa->write_characters_at(offset, vec.data(), sizeof(NumberType)); + } + // UBJSON: write number (floating point) template expected = + { + 0x0D, 0x00, 0x00, 0x00, // size (little endian) + 0x08, // entry: boolean + 'e', 'n', 't', 'r', 'y', '\x00', + 0x01, // value = true + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + + // SECTION("non-empty object with double") + // { + // json j = + // { + // { "entry", true } + // }; + + // std::vector expected = + // { + // 0x14, 0x00, 0x00, 0x00, // size (little endian) + // 0x01, /// entry: double + // 'e', 'n', 't', 'r', 'y', '\x00', + // 0xcd, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x10, 0x40, + // 0x00 // end marker + // }; + + // const auto result = json::to_bson(j); + // CHECK(result == expected); + + // // roundtrip + // //CHECK(json::from_bson(result) == j); + // //CHECK(json::from_bson(result, true, false) == j); + // } } } From 0c0f2e44b5bad1be335d68b35965ef05eb905e90 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 03:23:54 +0200 Subject: [PATCH 04/77] BSON: support doubles --- .../nlohmann/detail/input/binary_reader.hpp | 12 ++-- .../nlohmann/detail/output/binary_writer.hpp | 29 ++++++++- single_include/nlohmann/json.hpp | 41 ++++++++++-- test/src/unit-bson.cpp | 64 +++++++++++++------ 4 files changed, 115 insertions(+), 31 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 54833cc3..dc9015b8 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -137,8 +137,6 @@ class binary_reader } /*! - @param[in] len the length of the array or std::size_t(-1) for an - array of indefinite size @return whether array creation completed */ bool get_bson_str(string_t& result) @@ -179,15 +177,19 @@ class binary_reader string_t key; get_bson_str(key); sax->key(key); - sax->boolean(static_cast(get())); - } break; + double number; + get_number_little_endian(number); + sax->number_float(static_cast(number), ""); + } + break; case 0x08: { string_t key; get_bson_str(key); sax->key(key); sax->boolean(static_cast(get())); - } break; + } + break; } } diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 98e6104b..283c2cf2 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -676,8 +676,7 @@ class binary_writer } } - - std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + std::size_t write_bson_boolean(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { oa->write_character(static_cast(0x08)); // boolean oa->write_characters( @@ -687,6 +686,32 @@ class binary_writer return /*id*/ 1ul + name.size() + 1u + /*boolean value*/ 1u; } + std::size_t write_bson_double(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x01)); // boolean + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + write_number_little_endian(j.m_value.number_float); + return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u; + } + + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + switch (j.type()) + { + default: + JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); + break; + case value_t::boolean: + return write_bson_boolean(name, j); + case value_t::number_float: + return write_bson_double(name, j); + }; + + return 0ul; + } + /*! @param[in] j JSON value to serialize @pre j.type() == value_t::object diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 6b81d354..3da42389 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6121,8 +6121,6 @@ class binary_reader } /*! - @param[in] len the length of the array or std::size_t(-1) for an - array of indefinite size @return whether array creation completed */ bool get_bson_str(string_t& result) @@ -6158,6 +6156,16 @@ class binary_reader { switch (entry_type) { + case 0x01: + { + string_t key; + get_bson_str(key); + sax->key(key); + double number; + get_number_little_endian(number); + sax->number_float(static_cast(number), ""); + } + break; case 0x08: { string_t key; @@ -8461,8 +8469,7 @@ class binary_writer } } - - std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + std::size_t write_bson_boolean(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { oa->write_character(static_cast(0x08)); // boolean oa->write_characters( @@ -8472,6 +8479,32 @@ class binary_writer return /*id*/ 1ul + name.size() + 1u + /*boolean value*/ 1u; } + std::size_t write_bson_double(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x01)); // boolean + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + write_number_little_endian(j.m_value.number_float); + return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u; + } + + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + switch (j.type()) + { + default: + JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); + break; + case value_t::boolean: + return write_bson_boolean(name, j); + case value_t::number_float: + return write_bson_double(name, j); + }; + + return 0ul; + } + /*! @param[in] j JSON value to serialize @pre j.type() == value_t::object diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 9a710707..97746807 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -136,28 +136,52 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } - // SECTION("non-empty object with double") - // { - // json j = - // { - // { "entry", true } - // }; + SECTION("non-empty object with bool") + { + json j = + { + { "entry", false } + }; - // std::vector expected = - // { - // 0x14, 0x00, 0x00, 0x00, // size (little endian) - // 0x01, /// entry: double - // 'e', 'n', 't', 'r', 'y', '\x00', - // 0xcd, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x10, 0x40, - // 0x00 // end marker - // }; + std::vector expected = + { + 0x0D, 0x00, 0x00, 0x00, // size (little endian) + 0x08, // entry: boolean + 'e', 'n', 't', 'r', 'y', '\x00', + 0x00, // value = false + 0x00 // end marker + }; - // const auto result = json::to_bson(j); - // CHECK(result == expected); + const auto result = json::to_bson(j); + CHECK(result == expected); - // // roundtrip - // //CHECK(json::from_bson(result) == j); - // //CHECK(json::from_bson(result, true, false) == j); - // } + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + + SECTION("non-empty object with double") + { + json j = + { + { "entry", 4.2 } + }; + + std::vector expected = + { + 0x14, 0x00, 0x00, 0x00, // size (little endian) + 0x01, /// entry: double + 'e', 'n', 't', 'r', 'y', '\x00', + 0xcd, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x10, 0x40, + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } } } From 6c447de0768cb9cf235c886525e1aaa411a34e3d Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 11:33:24 +0200 Subject: [PATCH 05/77] BSON: Support objects with string members --- .../nlohmann/detail/input/binary_reader.hpp | 25 ++++++++--- .../nlohmann/detail/output/binary_writer.hpp | 19 +++++++- single_include/nlohmann/json.hpp | 44 ++++++++++++++++--- test/src/unit-bson.cpp | 26 +++++++++++ 4 files changed, 100 insertions(+), 14 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index dc9015b8..113dcb91 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -139,7 +139,7 @@ class binary_reader /*! @return whether array creation completed */ - bool get_bson_str(string_t& result) + bool get_bson_cstr(string_t& result) { bool success = true; generate_until(std::back_inserter(result), [](char c) @@ -148,7 +148,7 @@ class binary_reader }, [this, &success] { get(); - if (JSON_UNLIKELY(unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof())) { success = false; } @@ -172,20 +172,33 @@ class binary_reader { switch (entry_type) { - case 0x01: + case 0x01: // double { string_t key; - get_bson_str(key); + get_bson_cstr(key); sax->key(key); double number; get_number_little_endian(number); sax->number_float(static_cast(number), ""); } break; - case 0x08: + case 0x02: // string { string_t key; - get_bson_str(key); + get_bson_cstr(key); + sax->key(key); + std::int32_t len; + string_t value; + get_number_little_endian(len); + get_string(len - 1ul, value); + get(); + sax->string(value); + } + break; + case 0x08: // boolean + { + string_t key; + get_bson_cstr(key); sax->key(key); sax->boolean(static_cast(get())); } diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 283c2cf2..a377d348 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -688,7 +688,7 @@ class binary_writer std::size_t write_bson_double(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { - oa->write_character(static_cast(0x01)); // boolean + oa->write_character(static_cast(0x01)); // double oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); @@ -696,6 +696,21 @@ class binary_writer return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u; } + std::size_t write_bson_string(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x02)); // string (UTF-8) + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(j.m_value.string->size() + 1ul)); + oa->write_characters( + reinterpret_cast(j.m_value.string->c_str()), + j.m_value.string->size() + 1); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t) + j.m_value.string->size() + 1ul; + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -707,6 +722,8 @@ class binary_writer return write_bson_boolean(name, j); case value_t::number_float: return write_bson_double(name, j); + case value_t::string: + return write_bson_string(name, j); }; return 0ul; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 3da42389..c549f907 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6123,7 +6123,7 @@ class binary_reader /*! @return whether array creation completed */ - bool get_bson_str(string_t& result) + bool get_bson_cstr(string_t& result) { bool success = true; generate_until(std::back_inserter(result), [](char c) @@ -6132,7 +6132,7 @@ class binary_reader }, [this, &success] { get(); - if (JSON_UNLIKELY(unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof())) { success = false; } @@ -6156,20 +6156,33 @@ class binary_reader { switch (entry_type) { - case 0x01: + case 0x01: // double { string_t key; - get_bson_str(key); + get_bson_cstr(key); sax->key(key); double number; get_number_little_endian(number); sax->number_float(static_cast(number), ""); } break; - case 0x08: + case 0x02: // string { string_t key; - get_bson_str(key); + get_bson_cstr(key); + sax->key(key); + std::int32_t len; + string_t value; + get_number_little_endian(len); + get_string(len - 1ul, value); + get(); + sax->string(value); + } + break; + case 0x08: // boolean + { + string_t key; + get_bson_cstr(key); sax->key(key); sax->boolean(static_cast(get())); } @@ -8481,7 +8494,7 @@ class binary_writer std::size_t write_bson_double(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { - oa->write_character(static_cast(0x01)); // boolean + oa->write_character(static_cast(0x01)); // double oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); @@ -8489,6 +8502,21 @@ class binary_writer return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u; } + std::size_t write_bson_string(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x02)); // string (UTF-8) + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(j.m_value.string->size() + 1ul)); + oa->write_characters( + reinterpret_cast(j.m_value.string->c_str()), + j.m_value.string->size() + 1); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t) + j.m_value.string->size() + 1ul; + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -8500,6 +8528,8 @@ class binary_writer return write_bson_boolean(name, j); case value_t::number_float: return write_bson_double(name, j); + case value_t::string: + return write_bson_string(name, j); }; return 0ul; diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 97746807..e3b4717f 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -183,5 +183,31 @@ TEST_CASE("BSON") CHECK(json::from_bson(result) == j); CHECK(json::from_bson(result, true, false) == j); } + + SECTION("non-empty object with string") + { + json j = + { + { "entry", "bsonstr" } + }; + + std::vector expected = + { + 0x18, 0x00, 0x00, 0x00, // size (little endian) + 0x02, /// entry: string (UTF-8) + 'e', 'n', 't', 'r', 'y', '\x00', + 0x08, 0x00, 0x00, 0x00, 'b', 's', 'o', 'n', 's', 't', 'r', '\x00', + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + + } } From c5ef0231712b33c5c05f4d77ac75eec2ac779ffe Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 11:38:26 +0200 Subject: [PATCH 06/77] BSON: support objects with null members --- .../nlohmann/detail/input/binary_reader.hpp | 8 +++++++ .../nlohmann/detail/output/binary_writer.hpp | 12 ++++++++++ single_include/nlohmann/json.hpp | 20 ++++++++++++++++ test/src/unit-bson.cpp | 23 +++++++++++++++++++ 4 files changed, 63 insertions(+) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 113dcb91..3fd6cc20 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -203,6 +203,14 @@ class binary_reader sax->boolean(static_cast(get())); } break; + case 0x0A: // null + { + string_t key; + get_bson_cstr(key); + sax->key(key); + sax->null(); + } + break; } } diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index a377d348..966d8c22 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -711,6 +711,16 @@ class binary_writer return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t) + j.m_value.string->size() + 1ul; } + std::size_t write_bson_null(const typename BasicJsonType::string_t& name, const BasicJsonType&) + { + oa->write_character(static_cast(0x0A)); // null + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + return /*id*/ 1ul + name.size() + 1ul; + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -724,6 +734,8 @@ class binary_writer return write_bson_double(name, j); case value_t::string: return write_bson_string(name, j); + case value_t::null: + return write_bson_null(name, j); }; return 0ul; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index c549f907..faeaf214 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6187,6 +6187,14 @@ class binary_reader sax->boolean(static_cast(get())); } break; + case 0x0A: // null + { + string_t key; + get_bson_cstr(key); + sax->key(key); + sax->null(); + } + break; } } @@ -8517,6 +8525,16 @@ class binary_writer return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t) + j.m_value.string->size() + 1ul; } + std::size_t write_bson_null(const typename BasicJsonType::string_t& name, const BasicJsonType&) + { + oa->write_character(static_cast(0x0A)); // null + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + return /*id*/ 1ul + name.size() + 1ul; + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -8530,6 +8548,8 @@ class binary_writer return write_bson_double(name, j); case value_t::string: return write_bson_string(name, j); + case value_t::null: + return write_bson_null(name, j); }; return 0ul; diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index e3b4717f..e83e112a 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -208,6 +208,29 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } + SECTION("non-empty object with null member") + { + json j = + { + { "entry", nullptr } + }; + + std::vector expected = + { + 0x0C, 0x00, 0x00, 0x00, // size (little endian) + 0x0A, /// entry: null + 'e', 'n', 't', 'r', 'y', '\x00', + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + } } From 7ee361f7ad3806258e3c9a7ea2fc8dce5fdb54bc Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 11:54:17 +0200 Subject: [PATCH 07/77] BSON: support objects with int32 members --- .../nlohmann/detail/input/binary_reader.hpp | 10 ++++++++ .../nlohmann/detail/output/binary_writer.hpp | 14 +++++++++++ single_include/nlohmann/json.hpp | 24 +++++++++++++++++++ test/src/unit-bson.cpp | 24 +++++++++++++++++++ 4 files changed, 72 insertions(+) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 3fd6cc20..f11e164e 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -203,6 +203,16 @@ class binary_reader sax->boolean(static_cast(get())); } break; + case 0x10: // int32 + { + string_t key; + get_bson_cstr(key); + sax->key(key); + std::int32_t value; + get_number_little_endian(value); + sax->number_integer(static_cast(value)); + } + break; case 0x0A: // null { string_t key; diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 966d8c22..ed59b7c2 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -721,6 +721,18 @@ class binary_writer return /*id*/ 1ul + name.size() + 1ul; } + std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x10)); // int32 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(j.m_value.number_integer)); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -732,6 +744,8 @@ class binary_writer return write_bson_boolean(name, j); case value_t::number_float: return write_bson_double(name, j); + case value_t::number_integer: + return write_bson_integer(name, j); case value_t::string: return write_bson_string(name, j); case value_t::null: diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index faeaf214..d0cce8a1 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6187,6 +6187,16 @@ class binary_reader sax->boolean(static_cast(get())); } break; + case 0x10: // int32 + { + string_t key; + get_bson_cstr(key); + sax->key(key); + std::int32_t value; + get_number_little_endian(value); + sax->number_integer(static_cast(value)); + } + break; case 0x0A: // null { string_t key; @@ -8535,6 +8545,18 @@ class binary_writer return /*id*/ 1ul + name.size() + 1ul; } + std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x10)); // int32 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(j.m_value.number_integer)); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -8546,6 +8568,8 @@ class binary_writer return write_bson_boolean(name, j); case value_t::number_float: return write_bson_double(name, j); + case value_t::number_integer: + return write_bson_integer(name, j); case value_t::string: return write_bson_string(name, j); case value_t::null: diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index e83e112a..266dd12a 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -231,6 +231,30 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } + SECTION("non-empty object with integer (32-bit) member") + { + json j = + { + { "entry", std::int32_t{0x12345678} } + }; + + std::vector expected = + { + 0x10, 0x00, 0x00, 0x00, // size (little endian) + 0x10, /// entry: int32 + 'e', 'n', 't', 'r', 'y', '\x00', + 0x78, 0x56, 0x34, 0x12, + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + } } From c0d8921a6797497f3fbd2a8c2a2b29aaca9704c3 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 12:00:53 +0200 Subject: [PATCH 08/77] BSON: support objects with int64 members --- .../nlohmann/detail/input/binary_reader.hpp | 10 ++++++ .../nlohmann/detail/output/binary_writer.hpp | 26 ++++++++++---- single_include/nlohmann/json.hpp | 36 +++++++++++++++---- test/src/unit-bson.cpp | 23 ++++++++++++ 4 files changed, 83 insertions(+), 12 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index f11e164e..d135a4c2 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -213,6 +213,16 @@ class binary_reader sax->number_integer(static_cast(value)); } break; + case 0x12: // int64 + { + string_t key; + get_bson_cstr(key); + sax->key(key); + std::int64_t value; + get_number_little_endian(value); + sax->number_integer(static_cast(value)); + } + break; case 0x0A: // null { string_t key; diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index ed59b7c2..24426d48 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -723,14 +723,28 @@ class binary_writer std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { - oa->write_character(static_cast(0x10)); // int32 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); + if (j.m_value.number_integer <= static_cast((std::numeric_limits::max)())) + { + oa->write_character(static_cast(0x10)); // int32 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.number_integer)); + write_number_little_endian(static_cast(j.m_value.number_integer)); - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + } + else + { + oa->write_character(static_cast(0x12)); // int64 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(j.m_value.number_integer)); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); + } } std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index d0cce8a1..c564e57f 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6197,6 +6197,16 @@ class binary_reader sax->number_integer(static_cast(value)); } break; + case 0x12: // int64 + { + string_t key; + get_bson_cstr(key); + sax->key(key); + std::int64_t value; + get_number_little_endian(value); + sax->number_integer(static_cast(value)); + } + break; case 0x0A: // null { string_t key; @@ -8547,14 +8557,28 @@ class binary_writer std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { - oa->write_character(static_cast(0x10)); // int32 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); + if (j.m_value.number_integer <= static_cast((std::numeric_limits::max)())) + { + oa->write_character(static_cast(0x10)); // int32 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.number_integer)); + write_number_little_endian(static_cast(j.m_value.number_integer)); - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + } + else + { + oa->write_character(static_cast(0x12)); // int64 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(j.m_value.number_integer)); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); + } } std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 266dd12a..73989769 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -255,6 +255,29 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } + SECTION("non-empty object with integer (64-bit) member") + { + json j = + { + { "entry", std::int64_t{0x1234567804030201} } + }; + + std::vector expected = + { + 0x14, 0x00, 0x00, 0x00, // size (little endian) + 0x12, /// entry: int64 + 'e', 'n', 't', 'r', 'y', '\x00', + 0x01, 0x02, 0x03, 0x04, 0x78, 0x56, 0x34, 0x12, + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } } } From 83b427ad676795d4181c49513aaa46b8352e27eb Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 12:11:21 +0200 Subject: [PATCH 09/77] BSON: unsigned integers --- .../nlohmann/detail/output/binary_writer.hpp | 34 ++++++++- single_include/nlohmann/json.hpp | 34 ++++++++- test/src/unit-bson.cpp | 72 +++++++++++++++++++ 3 files changed, 136 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 24426d48..770c7dd3 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -723,14 +723,42 @@ class binary_writer std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { - if (j.m_value.number_integer <= static_cast((std::numeric_limits::max)())) + auto n = j.m_value.number_integer; + if ((std::numeric_limits::min)() <= n and n <= (std::numeric_limits::max)()) { oa->write_character(static_cast(0x10)); // int32 oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.number_integer)); + write_number_little_endian(static_cast(n)); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + } + else + { + oa->write_character(static_cast(0x12)); // int64 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(j.m_value.number_integer)); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); + } + } + + std::size_t write_bson_unsigned(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + auto n = j.m_value.number_integer; + if (n <= static_cast((std::numeric_limits::max)())) + { + oa->write_character(static_cast(0x10)); // int32 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(n)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); } @@ -760,6 +788,8 @@ class binary_writer return write_bson_double(name, j); case value_t::number_integer: return write_bson_integer(name, j); + case value_t::number_unsigned: + return write_bson_unsigned(name, j); case value_t::string: return write_bson_string(name, j); case value_t::null: diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index c564e57f..fa1d8e39 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -8557,14 +8557,42 @@ class binary_writer std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { - if (j.m_value.number_integer <= static_cast((std::numeric_limits::max)())) + auto n = j.m_value.number_integer; + if ((std::numeric_limits::min)() <= n and n <= (std::numeric_limits::max)()) { oa->write_character(static_cast(0x10)); // int32 oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.number_integer)); + write_number_little_endian(static_cast(n)); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + } + else + { + oa->write_character(static_cast(0x12)); // int64 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(j.m_value.number_integer)); + + return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); + } + } + + std::size_t write_bson_unsigned(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + auto n = j.m_value.number_integer; + if (n <= static_cast((std::numeric_limits::max)())) + { + oa->write_character(static_cast(0x10)); // int32 + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + write_number_little_endian(static_cast(n)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); } @@ -8594,6 +8622,8 @@ class binary_writer return write_bson_double(name, j); case value_t::number_integer: return write_bson_integer(name, j); + case value_t::number_unsigned: + return write_bson_unsigned(name, j); case value_t::string: return write_bson_string(name, j); case value_t::null: diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 73989769..8de05e80 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -279,5 +279,77 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } + SECTION("non-empty object with negative integer (32-bit) member") + { + json j = + { + { "entry", std::int32_t{-1} } + }; + + std::vector expected = + { + 0x10, 0x00, 0x00, 0x00, // size (little endian) + 0x10, /// entry: int32 + 'e', 'n', 't', 'r', 'y', '\x00', + 0xFF, 0xFF, 0xFF, 0xFF, + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + + SECTION("non-empty object with negative integer (64-bit) member") + { + json j = + { + { "entry", std::int64_t{-1} } + }; + + std::vector expected = + { + 0x10, 0x00, 0x00, 0x00, // size (little endian) + 0x10, /// entry: int32 + 'e', 'n', 't', 'r', 'y', '\x00', + 0xFF, 0xFF, 0xFF, 0xFF, + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + + SECTION("non-empty object with unsigned integer (64-bit) member") + { + // directly encoding uint64 is not supported in bson (only for timestamp values) + json j = + { + { "entry", std::uint64_t{0x1234567804030201} } + }; + + std::vector expected = + { + 0x14, 0x00, 0x00, 0x00, // size (little endian) + 0x12, /// entry: int64 + 'e', 'n', 't', 'r', 'y', '\x00', + 0x01, 0x02, 0x03, 0x04, 0x78, 0x56, 0x34, 0x12, + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } } } From 5ce7d6bdd7dc28d8d9e8f6d3bc91b541217bdb5d Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 13:03:42 +0200 Subject: [PATCH 10/77] BSON: support objects with objects as members --- .../nlohmann/detail/input/binary_reader.hpp | 9 +++++- .../nlohmann/detail/output/binary_writer.hpp | 17 ++++++++++- single_include/nlohmann/json.hpp | 26 +++++++++++++++-- test/src/unit-bson.cpp | 29 +++++++++++++++++++ 4 files changed, 77 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index d135a4c2..7deb788a 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -231,10 +231,17 @@ class binary_reader sax->null(); } break; + case 0x03: // object + { + string_t key; + get_bson_cstr(key); + sax->key(key); + parse_bson_internal(); + } + break; } } - get(); const auto result = sax->end_object(); return result; diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 770c7dd3..1ec1d794 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -775,6 +775,18 @@ class binary_writer } } + std::size_t write_bson_object_internal(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x03)); // object + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + auto const embedded_document_size = write_bson_object(j); + + return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -782,6 +794,8 @@ class binary_writer default: JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); break; + case value_t::object: + return write_bson_object_internal(name, j); case value_t::boolean: return write_bson_boolean(name, j); case value_t::number_float: @@ -803,7 +817,7 @@ class binary_writer @param[in] j JSON value to serialize @pre j.type() == value_t::object */ - void write_bson_object(const BasicJsonType& j) + std::size_t write_bson_object(const BasicJsonType& j) { assert(j.type() == value_t::object); auto document_size_offset = oa->reserve_characters(4ul); @@ -816,6 +830,7 @@ class binary_writer oa->write_character(static_cast(0x00)); write_number_little_endian_at(document_size_offset, document_size); + return document_size; } /*! diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index fa1d8e39..6201f047 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6215,10 +6215,17 @@ class binary_reader sax->null(); } break; + case 0x03: // object + { + string_t key; + get_bson_cstr(key); + sax->key(key); + parse_bson_internal(); + } + break; } } - get(); const auto result = sax->end_object(); return result; @@ -8609,6 +8616,18 @@ class binary_writer } } + std::size_t write_bson_object_internal(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x03)); // object + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + auto const embedded_document_size = write_bson_object(j); + + return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -8616,6 +8635,8 @@ class binary_writer default: JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); break; + case value_t::object: + return write_bson_object_internal(name, j); case value_t::boolean: return write_bson_boolean(name, j); case value_t::number_float: @@ -8637,7 +8658,7 @@ class binary_writer @param[in] j JSON value to serialize @pre j.type() == value_t::object */ - void write_bson_object(const BasicJsonType& j) + std::size_t write_bson_object(const BasicJsonType& j) { assert(j.type() == value_t::object); auto document_size_offset = oa->reserve_characters(4ul); @@ -8650,6 +8671,7 @@ class binary_writer oa->write_character(static_cast(0x00)); write_number_little_endian_at(document_size_offset, document_size); + return document_size; } /*! diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 8de05e80..bdc6fe74 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -351,5 +351,34 @@ TEST_CASE("BSON") CHECK(json::from_bson(result) == j); CHECK(json::from_bson(result, true, false) == j); } + + SECTION("non-empty object with object member") + { + // directly encoding uint64 is not supported in bson (only for timestamp values) + json j = + { + { "entry", json::object() } + }; + + std::vector expected = + { + 0x11, 0x00, 0x00, 0x00, // size (little endian) + 0x03, /// entry: embedded document + 'e', 'n', 't', 'r', 'y', '\x00', + + 0x05, 0x00, 0x00, 0x00, // size (little endian) + // no entries + 0x00, // end marker (embedded document) + + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } } } From 120d1d77d4371db55dffefa27c1ec16fd648e40a Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 13:40:20 +0200 Subject: [PATCH 11/77] BSON: test case for a more complex document --- .../nlohmann/detail/output/binary_writer.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- test/src/unit-bson.cpp | 32 +++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 1ec1d794..aa4f34fe 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -792,7 +792,7 @@ class binary_writer switch (j.type()) { default: - JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); + JSON_THROW(type_error::create(317, "JSON value of type be serialized to requested format: " + std::to_string((int)j.type()))); break; case value_t::object: return write_bson_object_internal(name, j); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 6201f047..1c966bc3 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -8633,7 +8633,7 @@ class binary_writer switch (j.type()) { default: - JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); + JSON_THROW(type_error::create(317, "JSON value of type be serialized to requested format: " + std::to_string((int)j.type()))); break; case value_t::object: return write_bson_object_internal(name, j); diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index bdc6fe74..c016466d 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -380,5 +380,37 @@ TEST_CASE("BSON") CHECK(json::from_bson(result) == j); CHECK(json::from_bson(result, true, false) == j); } + + SECTION("Some more complex document") + { + // directly encoding uint64 is not supported in bson (only for timestamp values) + json j = + { + {"double", 42.5}, + {"entry", 4.2}, + {"number", 12345}, + {"object", {{ "string", "value" }}} + }; + + std::vector expected = + { + /*size */ 0x4f, 0x00, 0x00, 0x00, + /*entry*/ 0x01, 'd', 'o', 'u', 'b', 'l', 'e', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x45, 0x40, + /*entry*/ 0x01, 'e', 'n', 't', 'r', 'y', 0x00, 0xcd, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x10, 0x40, + /*entry*/ 0x10, 'n', 'u', 'm', 'b', 'e', 'r', 0x00, 0x39, 0x30, 0x00, 0x00, + /*entry*/ 0x03, 'o', 'b', 'j', 'e', 'c', 't', 0x00, + /*entry: obj-size */ 0x17, 0x00, 0x00, 0x00, + /*entry: obj-entry*/0x02, 's', 't', 'r', 'i', 'n', 'g', 0x00, 0x06, 0x00, 0x00, 0x00, 'v', 'a', 'l', 'u', 'e', 0, + /*entry: obj-term.*/0x00, + /*obj-term*/ 0x00 + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } } } From cf485c2907e394aafc50e77bc372603467ee9f33 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 13:54:08 +0200 Subject: [PATCH 12/77] BSON: Support for arrays --- .../nlohmann/detail/input/binary_reader.hpp | 49 ++++++++++--- .../nlohmann/detail/output/binary_writer.hpp | 24 ++++++ single_include/nlohmann/json.hpp | 73 ++++++++++++++++--- test/src/unit-bson.cpp | 29 +++++++- 4 files changed, 154 insertions(+), 21 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 7deb788a..140cd8ab 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -157,17 +157,8 @@ class binary_reader return success; } - - bool parse_bson_internal() + void parse_bson_entries() { - std::int32_t documentSize; - get_number_little_endian(documentSize); - - if (not JSON_UNLIKELY(sax->start_object(-1))) - { - return false; - } - while (auto entry_type = get()) { switch (entry_type) @@ -239,8 +230,46 @@ class binary_reader parse_bson_internal(); } break; + case 0x04: // array + { + string_t key; + get_bson_cstr(key); + sax->key(key); + parse_bson_array(); + } + break; } } + } + + bool parse_bson_array() + { + std::int32_t documentSize; + get_number_little_endian(documentSize); + + if (not JSON_UNLIKELY(sax->start_array(-1))) + { + return false; + } + + parse_bson_entries(); + + const auto result = sax->end_array(); + + return result; + } + + bool parse_bson_internal() + { + std::int32_t documentSize; + get_number_little_endian(documentSize); + + if (not JSON_UNLIKELY(sax->start_object(-1))) + { + return false; + } + + parse_bson_entries(); const auto result = sax->end_object(); diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index aa4f34fe..24333935 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -787,6 +787,28 @@ class binary_writer return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; } + std::size_t write_bson_array(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x04)); // object + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + + auto document_size_offset = oa->reserve_characters(4ul); + std::int32_t embedded_document_size = 5ul; + + for (const auto& el : *j.m_value.array) + { + embedded_document_size += write_bson_object_entry("", el); + } + + oa->write_character(static_cast(0x00)); + write_number_little_endian_at(document_size_offset, embedded_document_size); + + return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -796,6 +818,8 @@ class binary_writer break; case value_t::object: return write_bson_object_internal(name, j); + case value_t::array: + return write_bson_array(name, j); case value_t::boolean: return write_bson_boolean(name, j); case value_t::number_float: diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 1c966bc3..adb0d294 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6141,17 +6141,8 @@ class binary_reader return success; } - - bool parse_bson_internal() + void parse_bson_entries() { - std::int32_t documentSize; - get_number_little_endian(documentSize); - - if (not JSON_UNLIKELY(sax->start_object(-1))) - { - return false; - } - while (auto entry_type = get()) { switch (entry_type) @@ -6223,8 +6214,46 @@ class binary_reader parse_bson_internal(); } break; + case 0x04: // array + { + string_t key; + get_bson_cstr(key); + sax->key(key); + parse_bson_array(); + } + break; } } + } + + bool parse_bson_array() + { + std::int32_t documentSize; + get_number_little_endian(documentSize); + + if (not JSON_UNLIKELY(sax->start_array(-1))) + { + return false; + } + + parse_bson_entries(); + + const auto result = sax->end_array(); + + return result; + } + + bool parse_bson_internal() + { + std::int32_t documentSize; + get_number_little_endian(documentSize); + + if (not JSON_UNLIKELY(sax->start_object(-1))) + { + return false; + } + + parse_bson_entries(); const auto result = sax->end_object(); @@ -8628,6 +8657,28 @@ class binary_writer return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; } + std::size_t write_bson_array(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + oa->write_character(static_cast(0x04)); // object + oa->write_characters( + reinterpret_cast(name.c_str()), + name.size() + 1u); + + + auto document_size_offset = oa->reserve_characters(4ul); + std::int32_t embedded_document_size = 5ul; + + for (const auto& el : *j.m_value.array) + { + embedded_document_size += write_bson_object_entry("", el); + } + + oa->write_character(static_cast(0x00)); + write_number_little_endian_at(document_size_offset, embedded_document_size); + + return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; + } + std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) @@ -8637,6 +8688,8 @@ class binary_writer break; case value_t::object: return write_bson_object_internal(name, j); + case value_t::array: + return write_bson_array(name, j); case value_t::boolean: return write_bson_boolean(name, j); case value_t::number_float: diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index c016466d..b2886110 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -354,7 +354,6 @@ TEST_CASE("BSON") SECTION("non-empty object with object member") { - // directly encoding uint64 is not supported in bson (only for timestamp values) json j = { { "entry", json::object() } @@ -381,6 +380,34 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } + SECTION("non-empty object with array member") + { + json j = + { + { "entry", json::array() } + }; + + std::vector expected = + { + 0x11, 0x00, 0x00, 0x00, // size (little endian) + 0x04, /// entry: embedded document + 'e', 'n', 't', 'r', 'y', '\x00', + + 0x05, 0x00, 0x00, 0x00, // size (little endian) + // no entries + 0x00, // end marker (embedded document) + + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + SECTION("Some more complex document") { // directly encoding uint64 is not supported in bson (only for timestamp values) From df33a90774c8a63140b49685c47be964a2409167 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 15 Sep 2018 14:08:38 +0200 Subject: [PATCH 13/77] BSON: Bugfix for non-empty arrays --- .../nlohmann/detail/input/binary_reader.hpp | 37 +++++-------------- single_include/nlohmann/json.hpp | 37 +++++-------------- test/src/unit-bson.cpp | 35 ++++++++++++++++++ 3 files changed, 55 insertions(+), 54 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 140cd8ab..f4049bd3 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -157,17 +157,21 @@ class binary_reader return success; } - void parse_bson_entries() + void parse_bson_entries(bool is_array) { while (auto entry_type = get()) { + string_t key; + get_bson_cstr(key); + if (!is_array) + { + sax->key(key); + } + switch (entry_type) { case 0x01: // double { - string_t key; - get_bson_cstr(key); - sax->key(key); double number; get_number_little_endian(number); sax->number_float(static_cast(number), ""); @@ -175,9 +179,6 @@ class binary_reader break; case 0x02: // string { - string_t key; - get_bson_cstr(key); - sax->key(key); std::int32_t len; string_t value; get_number_little_endian(len); @@ -188,17 +189,11 @@ class binary_reader break; case 0x08: // boolean { - string_t key; - get_bson_cstr(key); - sax->key(key); sax->boolean(static_cast(get())); } break; case 0x10: // int32 { - string_t key; - get_bson_cstr(key); - sax->key(key); std::int32_t value; get_number_little_endian(value); sax->number_integer(static_cast(value)); @@ -206,9 +201,6 @@ class binary_reader break; case 0x12: // int64 { - string_t key; - get_bson_cstr(key); - sax->key(key); std::int64_t value; get_number_little_endian(value); sax->number_integer(static_cast(value)); @@ -216,25 +208,16 @@ class binary_reader break; case 0x0A: // null { - string_t key; - get_bson_cstr(key); - sax->key(key); sax->null(); } break; case 0x03: // object { - string_t key; - get_bson_cstr(key); - sax->key(key); parse_bson_internal(); } break; case 0x04: // array { - string_t key; - get_bson_cstr(key); - sax->key(key); parse_bson_array(); } break; @@ -252,7 +235,7 @@ class binary_reader return false; } - parse_bson_entries(); + parse_bson_entries(/*is_array*/true); const auto result = sax->end_array(); @@ -269,7 +252,7 @@ class binary_reader return false; } - parse_bson_entries(); + parse_bson_entries(/*is_array*/false); const auto result = sax->end_object(); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index adb0d294..6f481a8f 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6141,17 +6141,21 @@ class binary_reader return success; } - void parse_bson_entries() + void parse_bson_entries(bool is_array) { while (auto entry_type = get()) { + string_t key; + get_bson_cstr(key); + if (!is_array) + { + sax->key(key); + } + switch (entry_type) { case 0x01: // double { - string_t key; - get_bson_cstr(key); - sax->key(key); double number; get_number_little_endian(number); sax->number_float(static_cast(number), ""); @@ -6159,9 +6163,6 @@ class binary_reader break; case 0x02: // string { - string_t key; - get_bson_cstr(key); - sax->key(key); std::int32_t len; string_t value; get_number_little_endian(len); @@ -6172,17 +6173,11 @@ class binary_reader break; case 0x08: // boolean { - string_t key; - get_bson_cstr(key); - sax->key(key); sax->boolean(static_cast(get())); } break; case 0x10: // int32 { - string_t key; - get_bson_cstr(key); - sax->key(key); std::int32_t value; get_number_little_endian(value); sax->number_integer(static_cast(value)); @@ -6190,9 +6185,6 @@ class binary_reader break; case 0x12: // int64 { - string_t key; - get_bson_cstr(key); - sax->key(key); std::int64_t value; get_number_little_endian(value); sax->number_integer(static_cast(value)); @@ -6200,25 +6192,16 @@ class binary_reader break; case 0x0A: // null { - string_t key; - get_bson_cstr(key); - sax->key(key); sax->null(); } break; case 0x03: // object { - string_t key; - get_bson_cstr(key); - sax->key(key); parse_bson_internal(); } break; case 0x04: // array { - string_t key; - get_bson_cstr(key); - sax->key(key); parse_bson_array(); } break; @@ -6236,7 +6219,7 @@ class binary_reader return false; } - parse_bson_entries(); + parse_bson_entries(/*is_array*/true); const auto result = sax->end_array(); @@ -6253,7 +6236,7 @@ class binary_reader return false; } - parse_bson_entries(); + parse_bson_entries(/*is_array*/false); const auto result = sax->end_object(); diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index b2886110..fcaf51d6 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -408,6 +408,41 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } + SECTION("non-empty object with non-empty array member") + { + json j = + { + { "entry", json::array({1, 2, 3, 4, 5, 6, 7, 8}) } + }; + + std::vector expected = + { + 0x41, 0x00, 0x00, 0x00, // size (little endian) + 0x04, /// entry: embedded document + 'e', 'n', 't', 'r', 'y', '\x00', + + 0x35, 0x00, 0x00, 0x00, // size (little endian) + 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x00, // end marker (embedded document) + + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + SECTION("Some more complex document") { // directly encoding uint64 is not supported in bson (only for timestamp values) From 763705c2a7fca0dd3b6569e783403b917ee03b09 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Mon, 24 Sep 2018 19:29:39 +0200 Subject: [PATCH 14/77] Fix: Add missing `begin()` and `end()` member functions to `alt_string` --- test/src/unit-alt-string.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/src/unit-alt-string.cpp b/test/src/unit-alt-string.cpp index 356835c0..ba52d6a4 100644 --- a/test/src/unit-alt-string.cpp +++ b/test/src/unit-alt-string.cpp @@ -102,6 +102,10 @@ class alt_string str_impl.resize(n, c); } + auto begin() -> std::string::iterator { return str_impl.begin(); } + + auto end() -> std::string::iterator { return str_impl.end(); } + template bool operator<(const op_type& op) const { From bce4816275bc4b856643219a5418198ab258c522 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Mon, 24 Sep 2018 23:35:19 +0200 Subject: [PATCH 15/77] BSON: Added test case for the different input/output_adapters --- test/src/unit-alt-string.cpp | 10 +++++-- test/src/unit-bson.cpp | 58 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/test/src/unit-alt-string.cpp b/test/src/unit-alt-string.cpp index ba52d6a4..d866ed70 100644 --- a/test/src/unit-alt-string.cpp +++ b/test/src/unit-alt-string.cpp @@ -102,9 +102,15 @@ class alt_string str_impl.resize(n, c); } - auto begin() -> std::string::iterator { return str_impl.begin(); } + auto begin() -> std::string::iterator + { + return str_impl.begin(); + } - auto end() -> std::string::iterator { return str_impl.end(); } + auto end() -> std::string::iterator + { + return str_impl.end(); + } template bool operator<(const op_type& op) const diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index fcaf51d6..c701af40 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -476,3 +476,61 @@ TEST_CASE("BSON") } } } + +TEST_CASE("BSON input/output_adapters") +{ + json json_representation = + { + {"double", 42.5}, + {"entry", 4.2}, + {"number", 12345}, + {"object", {{ "string", "value" }}} + }; + + std::vector bson_representation = + { + /*size */ 0x4f, 0x00, 0x00, 0x00, + /*entry*/ 0x01, 'd', 'o', 'u', 'b', 'l', 'e', 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x45, 0x40, + /*entry*/ 0x01, 'e', 'n', 't', 'r', 'y', 0x00, 0xcd, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x10, 0x40, + /*entry*/ 0x10, 'n', 'u', 'm', 'b', 'e', 'r', 0x00, 0x39, 0x30, 0x00, 0x00, + /*entry*/ 0x03, 'o', 'b', 'j', 'e', 'c', 't', 0x00, + /*entry: obj-size */ 0x17, 0x00, 0x00, 0x00, + /*entry: obj-entry*/0x02, 's', 't', 'r', 'i', 'n', 'g', 0x00, 0x06, 0x00, 0x00, 0x00, 'v', 'a', 'l', 'u', 'e', 0, + /*entry: obj-term.*/0x00, + /*obj-term*/ 0x00 + }; + + json j2; + CHECK_NOTHROW(j2 = json::from_bson(bson_representation)); + + // compare parsed JSON values + CHECK(json_representation == j2); + + SECTION("roundtrips") + { + SECTION("std::ostringstream") + { + std::ostringstream ss; + json::to_bson(json_representation, ss); + std::istringstream iss(ss.str()); + json j3 = json::from_bson(iss); + CHECK(json_representation == j3); + } + + SECTION("std::string") + { + std::string s; + json::to_bson(json_representation, s); + json j3 = json::from_bson(s); + CHECK(json_representation == j3); + } + + SECTION("std::vector") + { + std::vector v; + json::to_bson(json_representation, v); + json j3 = json::from_bson(v); + CHECK(json_representation == j3); + } + } +} From ef358ae695d1d3c6f20681a4a4c3aa7b64b967ad Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Tue, 25 Sep 2018 20:34:25 +0200 Subject: [PATCH 16/77] BSON: Fixed hangup in case of incomplete bson input and improved test coverage --- .../nlohmann/detail/input/binary_reader.hpp | 35 ++-- .../nlohmann/detail/output/binary_writer.hpp | 59 +++--- single_include/nlohmann/json.hpp | 94 +++++----- test/src/unit-bson.cpp | 174 ++++++++++++++++++ 4 files changed, 260 insertions(+), 102 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index f4049bd3..0a95fef5 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -142,9 +142,9 @@ class binary_reader bool get_bson_cstr(string_t& result) { bool success = true; - generate_until(std::back_inserter(result), [](char c) + generate_until(std::back_inserter(result), [&success](char c) { - return c == 0x00; + return c == 0x00 || !success; }, [this, &success] { get(); @@ -157,12 +157,16 @@ class binary_reader return success; } - void parse_bson_entries(bool is_array) + bool parse_bson_entries(bool is_array) { while (auto entry_type = get()) { string_t key; - get_bson_cstr(key); + if (!get_bson_cstr(key)) + { + return false; + } + if (!is_array) { sax->key(key); @@ -223,6 +227,7 @@ class binary_reader break; } } + return true; } bool parse_bson_array() @@ -230,16 +235,17 @@ class binary_reader std::int32_t documentSize; get_number_little_endian(documentSize); - if (not JSON_UNLIKELY(sax->start_array(-1))) + if (JSON_UNLIKELY(not sax->start_array(-1))) { return false; } - parse_bson_entries(/*is_array*/true); + if (!parse_bson_entries(/*is_array*/true)) + { + return false; + } - const auto result = sax->end_array(); - - return result; + return sax->end_array(); } bool parse_bson_internal() @@ -247,16 +253,17 @@ class binary_reader std::int32_t documentSize; get_number_little_endian(documentSize); - if (not JSON_UNLIKELY(sax->start_object(-1))) + if (JSON_UNLIKELY(not sax->start_object(-1))) { return false; } - parse_bson_entries(/*is_array*/false); + if (!parse_bson_entries(/*is_array*/false)) + { + return false; + } - const auto result = sax->end_object(); - - return result; + return sax->end_object(); } /*! diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 24333935..d9655f93 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -692,7 +692,7 @@ class binary_writer oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(j.m_value.number_float); + write_number(j.m_value.number_float); return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u; } @@ -703,7 +703,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.string->size() + 1ul)); + write_number(static_cast(j.m_value.string->size() + 1ul)); oa->write_characters( reinterpret_cast(j.m_value.string->c_str()), j.m_value.string->size() + 1); @@ -731,7 +731,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(n)); + write_number(static_cast(n)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); } @@ -742,7 +742,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.number_integer)); + write_number(static_cast(j.m_value.number_integer)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); } @@ -758,7 +758,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(n)); + write_number(static_cast(n)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); } @@ -769,7 +769,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.number_integer)); + write_number(static_cast(j.m_value.number_integer)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); } @@ -804,7 +804,7 @@ class binary_writer } oa->write_character(static_cast(0x00)); - write_number_little_endian_at(document_size_offset, embedded_document_size); + write_number_at(document_size_offset, embedded_document_size); return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; } @@ -813,9 +813,11 @@ class binary_writer { switch (j.type()) { + // LCOV_EXCL_START default: - JSON_THROW(type_error::create(317, "JSON value of type be serialized to requested format: " + std::to_string((int)j.type()))); + assert(false); break; + // LCOV_EXCL_STOP case value_t::object: return write_bson_object_internal(name, j); case value_t::array: @@ -853,7 +855,7 @@ class binary_writer } oa->write_character(static_cast(0x00)); - write_number_little_endian_at(document_size_offset, document_size); + write_number_at(document_size_offset, document_size); return document_size; } @@ -883,12 +885,14 @@ class binary_writer @param[in] n number of type @a NumberType @tparam NumberType the type of the number + @tparam OutputIsLittleEndian Set to true if output data is + required to be little endian @note This function needs to respect the system's endianess, because bytes in CBOR, MessagePack, and UBJSON are stored in network order (big endian) and therefore need reordering on little endian systems. */ - template + template void write_number(const NumberType n) { // step 1: write number to array of length NumberType @@ -896,30 +900,7 @@ class binary_writer std::memcpy(vec.data(), &n, sizeof(NumberType)); // step 2: write array to output (with possible reordering) - if (is_little_endian) - { - // reverse byte order prior to conversion if necessary - std::reverse(vec.begin(), vec.end()); - } - - oa->write_characters(vec.data(), sizeof(NumberType)); - } - - /* - @brief write a number to output in little endian format - - @param[in] n number of type @a NumberType - @tparam NumberType the type of the number - */ - template - void write_number_little_endian(const NumberType n) - { - // step 1: write number to array of length NumberType - std::array vec; - std::memcpy(vec.data(), &n, sizeof(NumberType)); - - // step 2: write array to output (with possible reordering) - if (!is_little_endian) + if (is_little_endian && !OutputIsLittleEndian) { // reverse byte order prior to conversion if necessary std::reverse(vec.begin(), vec.end()); @@ -934,20 +915,24 @@ class binary_writer @param[in] offset The offset where to start writing @param[in] n number of type @a NumberType @tparam NumberType the type of the number + @tparam OutputIsLittleEndian Set to true if output data is + required to be little endian */ - template - void write_number_little_endian_at(std::size_t offset, const NumberType n) + template + void write_number_at(std::size_t offset, const NumberType n) { // step 1: write number to array of length NumberType std::array vec; std::memcpy(vec.data(), &n, sizeof(NumberType)); // step 2: write array to output (with possible reordering) - if (!is_little_endian) + // LCOV_EXCL_START + if (is_little_endian && !OutputIsLittleEndian) { // reverse byte order prior to conversion if necessary std::reverse(vec.begin(), vec.end()); } + // LCOV_EXCL_STOP oa->write_characters_at(offset, vec.data(), sizeof(NumberType)); } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 6f481a8f..3f7cd4e7 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6126,9 +6126,9 @@ class binary_reader bool get_bson_cstr(string_t& result) { bool success = true; - generate_until(std::back_inserter(result), [](char c) + generate_until(std::back_inserter(result), [&success](char c) { - return c == 0x00; + return c == 0x00 || !success; }, [this, &success] { get(); @@ -6141,12 +6141,16 @@ class binary_reader return success; } - void parse_bson_entries(bool is_array) + bool parse_bson_entries(bool is_array) { while (auto entry_type = get()) { string_t key; - get_bson_cstr(key); + if (!get_bson_cstr(key)) + { + return false; + } + if (!is_array) { sax->key(key); @@ -6207,6 +6211,7 @@ class binary_reader break; } } + return true; } bool parse_bson_array() @@ -6214,16 +6219,17 @@ class binary_reader std::int32_t documentSize; get_number_little_endian(documentSize); - if (not JSON_UNLIKELY(sax->start_array(-1))) + if (JSON_UNLIKELY(not sax->start_array(-1))) { return false; } - parse_bson_entries(/*is_array*/true); + if (!parse_bson_entries(/*is_array*/true)) + { + return false; + } - const auto result = sax->end_array(); - - return result; + return sax->end_array(); } bool parse_bson_internal() @@ -6231,16 +6237,17 @@ class binary_reader std::int32_t documentSize; get_number_little_endian(documentSize); - if (not JSON_UNLIKELY(sax->start_object(-1))) + if (JSON_UNLIKELY(not sax->start_object(-1))) { return false; } - parse_bson_entries(/*is_array*/false); + if (!parse_bson_entries(/*is_array*/false)) + { + return false; + } - const auto result = sax->end_object(); - - return result; + return sax->end_object(); } /*! @@ -8545,7 +8552,7 @@ class binary_writer oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(j.m_value.number_float); + write_number(j.m_value.number_float); return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u; } @@ -8556,7 +8563,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.string->size() + 1ul)); + write_number(static_cast(j.m_value.string->size() + 1ul)); oa->write_characters( reinterpret_cast(j.m_value.string->c_str()), j.m_value.string->size() + 1); @@ -8584,7 +8591,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(n)); + write_number(static_cast(n)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); } @@ -8595,7 +8602,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.number_integer)); + write_number(static_cast(j.m_value.number_integer)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); } @@ -8611,7 +8618,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(n)); + write_number(static_cast(n)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); } @@ -8622,7 +8629,7 @@ class binary_writer reinterpret_cast(name.c_str()), name.size() + 1u); - write_number_little_endian(static_cast(j.m_value.number_integer)); + write_number(static_cast(j.m_value.number_integer)); return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); } @@ -8657,7 +8664,7 @@ class binary_writer } oa->write_character(static_cast(0x00)); - write_number_little_endian_at(document_size_offset, embedded_document_size); + write_number_at(document_size_offset, embedded_document_size); return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; } @@ -8666,9 +8673,11 @@ class binary_writer { switch (j.type()) { + // LCOV_EXCL_START default: - JSON_THROW(type_error::create(317, "JSON value of type be serialized to requested format: " + std::to_string((int)j.type()))); + assert(false); break; + // LCOV_EXCL_STOP case value_t::object: return write_bson_object_internal(name, j); case value_t::array: @@ -8706,7 +8715,7 @@ class binary_writer } oa->write_character(static_cast(0x00)); - write_number_little_endian_at(document_size_offset, document_size); + write_number_at(document_size_offset, document_size); return document_size; } @@ -8736,12 +8745,14 @@ class binary_writer @param[in] n number of type @a NumberType @tparam NumberType the type of the number + @tparam OutputIsLittleEndian Set to true if output data is + required to be little endian @note This function needs to respect the system's endianess, because bytes in CBOR, MessagePack, and UBJSON are stored in network order (big endian) and therefore need reordering on little endian systems. */ - template + template void write_number(const NumberType n) { // step 1: write number to array of length NumberType @@ -8749,30 +8760,7 @@ class binary_writer std::memcpy(vec.data(), &n, sizeof(NumberType)); // step 2: write array to output (with possible reordering) - if (is_little_endian) - { - // reverse byte order prior to conversion if necessary - std::reverse(vec.begin(), vec.end()); - } - - oa->write_characters(vec.data(), sizeof(NumberType)); - } - - /* - @brief write a number to output in little endian format - - @param[in] n number of type @a NumberType - @tparam NumberType the type of the number - */ - template - void write_number_little_endian(const NumberType n) - { - // step 1: write number to array of length NumberType - std::array vec; - std::memcpy(vec.data(), &n, sizeof(NumberType)); - - // step 2: write array to output (with possible reordering) - if (!is_little_endian) + if (is_little_endian && !OutputIsLittleEndian) { // reverse byte order prior to conversion if necessary std::reverse(vec.begin(), vec.end()); @@ -8787,20 +8775,24 @@ class binary_writer @param[in] offset The offset where to start writing @param[in] n number of type @a NumberType @tparam NumberType the type of the number + @tparam OutputIsLittleEndian Set to true if output data is + required to be little endian */ - template - void write_number_little_endian_at(std::size_t offset, const NumberType n) + template + void write_number_at(std::size_t offset, const NumberType n) { // step 1: write number to array of length NumberType std::array vec; std::memcpy(vec.data(), &n, sizeof(NumberType)); // step 2: write array to output (with possible reordering) - if (!is_little_endian) + // LCOV_EXCL_START + if (is_little_endian && !OutputIsLittleEndian) { // reverse byte order prior to conversion if necessary std::reverse(vec.begin(), vec.end()); } + // LCOV_EXCL_STOP oa->write_characters_at(offset, vec.data(), sizeof(NumberType)); } diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index c701af40..cbb6785e 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -352,6 +352,31 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } + SECTION("non-empty object with small unsigned integer member") + { + json j = + { + { "entry", std::uint64_t{0x42} } + }; + + std::vector expected = + { + 0x10, 0x00, 0x00, 0x00, // size (little endian) + 0x10, /// entry: int32 + 'e', 'n', 't', 'r', 'y', '\x00', + 0x42, 0x00, 0x00, 0x00, + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + + // roundtrip + CHECK(json::from_bson(result) == j); + CHECK(json::from_bson(result, true, false) == j); + } + + SECTION("non-empty object with object member") { json j = @@ -534,3 +559,152 @@ TEST_CASE("BSON input/output_adapters") } } } + + + + + +class SaxCountdown +{ + public: + explicit SaxCountdown(const int count) : events_left(count) + {} + + bool null() + { + return events_left-- > 0; + } + + bool boolean(bool) + { + return events_left-- > 0; + } + + bool number_integer(json::number_integer_t) + { + return events_left-- > 0; + } + + bool number_unsigned(json::number_unsigned_t) + { + return events_left-- > 0; + } + + bool number_float(json::number_float_t, const std::string&) + { + return events_left-- > 0; + } + + bool string(std::string&) + { + return events_left-- > 0; + } + + bool start_object(std::size_t) + { + return events_left-- > 0; + } + + bool key(std::string&) + { + return events_left-- > 0; + } + + bool end_object() + { + return events_left-- > 0; + } + + bool start_array(std::size_t) + { + return events_left-- > 0; + } + + bool end_array() + { + return events_left-- > 0; + } + + bool parse_error(std::size_t, const std::string&, const json::exception&) + { + return false; + } + + private: + int events_left = 0; +}; + + +TEST_CASE("Incomplete BSON INPUT") +{ + std::vector incomplete_bson = + { + 0x0D, 0x00, 0x00, 0x00, // size (little endian) + 0x08, // entry: boolean + 'e', 'n', 't' // unexpected EOF + }; + + CHECK_THROWS_WITH(json::from_bson(incomplete_bson), + "[json.exception.parse_error.110] parse error at 9: unexpected end of input"); + CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); + + SaxCountdown scp(0); + CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); +} + +TEST_CASE("Incomplete BSON INPUT 2") +{ + std::vector incomplete_bson = + { + 0x0D, 0x00, 0x00, 0x00, // size (little endian) + 0x08, // entry: boolean, unexpected EOF + }; + + CHECK_THROWS_WITH(json::from_bson(incomplete_bson), + "[json.exception.parse_error.110] parse error at 6: unexpected end of input"); + CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); + + SaxCountdown scp(0); + CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); +} + + +TEST_CASE("Incomplete BSON INPUT 3") +{ + std::vector incomplete_bson = + { + 0x41, 0x00, 0x00, 0x00, // size (little endian) + 0x04, /// entry: embedded document + 'e', 'n', 't', 'r', 'y', '\x00', + + 0x35, 0x00, 0x00, 0x00, // size (little endian) + 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x02, 0x00, 0x00, 0x00 + // missing input data... + }; + CHECK_THROWS_WITH(json::from_bson(incomplete_bson), + "[json.exception.parse_error.110] parse error at 29: unexpected end of input"); + CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); + + SaxCountdown scp(1); + CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); +} + + + +TEST_CASE("Incomplete BSON INPUT 4") +{ + std::vector incomplete_bson = + { + 0x0D, 0x00, // size (incomplete), unexpected EOF + }; + + CHECK_THROWS_WITH(json::from_bson(incomplete_bson), + "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); + + SaxCountdown scp(0); + CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); +} + + From 0a09db9cc24fe23e226fd15ced3182068dba06ae Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 29 Sep 2018 11:33:01 +0200 Subject: [PATCH 17/77] BSON: Extend `binary_reader::get_number` to be able to hanlde little endian input to get rid of `binary_reader::get_number_little_endian` --- .../nlohmann/detail/input/binary_reader.hpp | 44 ++++--------------- single_include/nlohmann/json.hpp | 44 ++++--------------- 2 files changed, 16 insertions(+), 72 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 0a95fef5..d68a6091 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -177,7 +177,7 @@ class binary_reader case 0x01: // double { double number; - get_number_little_endian(number); + get_number(number); sax->number_float(static_cast(number), ""); } break; @@ -185,7 +185,7 @@ class binary_reader { std::int32_t len; string_t value; - get_number_little_endian(len); + get_number(len); get_string(len - 1ul, value); get(); sax->string(value); @@ -199,14 +199,14 @@ class binary_reader case 0x10: // int32 { std::int32_t value; - get_number_little_endian(value); + get_number(value); sax->number_integer(static_cast(value)); } break; case 0x12: // int64 { std::int64_t value; - get_number_little_endian(value); + get_number(value); sax->number_integer(static_cast(value)); } break; @@ -233,7 +233,7 @@ class binary_reader bool parse_bson_array() { std::int32_t documentSize; - get_number_little_endian(documentSize); + get_number(documentSize); if (JSON_UNLIKELY(not sax->start_array(-1))) { @@ -251,7 +251,7 @@ class binary_reader bool parse_bson_internal() { std::int32_t documentSize; - get_number_little_endian(documentSize); + get_number(documentSize); if (JSON_UNLIKELY(not sax->start_object(-1))) { @@ -1016,7 +1016,7 @@ class binary_reader bytes in CBOR, MessagePack, and UBJSON are stored in network order (big endian) and therefore need reordering on little endian systems. */ - template + template bool get_number(NumberType& result) { // step 1: read input into array with system's byte order @@ -1030,7 +1030,7 @@ class binary_reader } // reverse byte order prior to conversion if necessary - if (is_little_endian) + if (is_little_endian && !InputIsLittleEndian) { vec[sizeof(NumberType) - i - 1] = static_cast(current); } @@ -1045,34 +1045,6 @@ class binary_reader return true; } - template - bool get_number_little_endian(NumberType& result) - { - // step 1: read input into array with system's byte order - std::array vec; - for (std::size_t i = 0; i < sizeof(NumberType); ++i) - { - get(); - if (JSON_UNLIKELY(not unexpect_eof())) - { - return false; - } - - // reverse byte order prior to conversion if necessary - if (!is_little_endian) - { - vec[sizeof(NumberType) - i - 1] = static_cast(current); - } - else - { - vec[i] = static_cast(current); // LCOV_EXCL_LINE - } - } - - // step 2: convert array into number of type T and return - std::memcpy(&result, vec.data(), sizeof(NumberType)); - return true; - } /*! @brief create a string by reading characters from the input diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 3f7cd4e7..ac11591a 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6161,7 +6161,7 @@ class binary_reader case 0x01: // double { double number; - get_number_little_endian(number); + get_number(number); sax->number_float(static_cast(number), ""); } break; @@ -6169,7 +6169,7 @@ class binary_reader { std::int32_t len; string_t value; - get_number_little_endian(len); + get_number(len); get_string(len - 1ul, value); get(); sax->string(value); @@ -6183,14 +6183,14 @@ class binary_reader case 0x10: // int32 { std::int32_t value; - get_number_little_endian(value); + get_number(value); sax->number_integer(static_cast(value)); } break; case 0x12: // int64 { std::int64_t value; - get_number_little_endian(value); + get_number(value); sax->number_integer(static_cast(value)); } break; @@ -6217,7 +6217,7 @@ class binary_reader bool parse_bson_array() { std::int32_t documentSize; - get_number_little_endian(documentSize); + get_number(documentSize); if (JSON_UNLIKELY(not sax->start_array(-1))) { @@ -6235,7 +6235,7 @@ class binary_reader bool parse_bson_internal() { std::int32_t documentSize; - get_number_little_endian(documentSize); + get_number(documentSize); if (JSON_UNLIKELY(not sax->start_object(-1))) { @@ -7000,7 +7000,7 @@ class binary_reader bytes in CBOR, MessagePack, and UBJSON are stored in network order (big endian) and therefore need reordering on little endian systems. */ - template + template bool get_number(NumberType& result) { // step 1: read input into array with system's byte order @@ -7014,7 +7014,7 @@ class binary_reader } // reverse byte order prior to conversion if necessary - if (is_little_endian) + if (is_little_endian && !InputIsLittleEndian) { vec[sizeof(NumberType) - i - 1] = static_cast(current); } @@ -7029,34 +7029,6 @@ class binary_reader return true; } - template - bool get_number_little_endian(NumberType& result) - { - // step 1: read input into array with system's byte order - std::array vec; - for (std::size_t i = 0; i < sizeof(NumberType); ++i) - { - get(); - if (JSON_UNLIKELY(not unexpect_eof())) - { - return false; - } - - // reverse byte order prior to conversion if necessary - if (!is_little_endian) - { - vec[sizeof(NumberType) - i - 1] = static_cast(current); - } - else - { - vec[i] = static_cast(current); // LCOV_EXCL_LINE - } - } - - // step 2: convert array into number of type T and return - std::memcpy(&result, vec.data(), sizeof(NumberType)); - return true; - } /*! @brief create a string by reading characters from the input From e8730e5e82493d82c9dae8bd73ae6eedc9267de5 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sat, 29 Sep 2018 11:50:01 +0200 Subject: [PATCH 18/77] BSON: Reworked `binary_reader::get_bson_cstr()` --- .../nlohmann/detail/input/binary_reader.hpp | 31 +++++++------------ single_include/nlohmann/json.hpp | 31 +++++++------------ 2 files changed, 22 insertions(+), 40 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index d68a6091..0b718dd4 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -125,36 +125,27 @@ class binary_reader private: - template - OutputIt generate_until(OutputIt&& d_first, UnaryPredicate&& pred, Gen&& gen) - { - for (auto x = gen(); !pred(x); x = gen()) - { - *d_first++ = x; - } - - return d_first; - } - /*! @return whether array creation completed */ bool get_bson_cstr(string_t& result) { - bool success = true; - generate_until(std::back_inserter(result), [&success](char c) - { - return c == 0x00 || !success; - }, [this, &success] + auto out = std::back_inserter(result); + while (true) { get(); if (JSON_UNLIKELY(not unexpect_eof())) { - success = false; + return false; } - return static_cast(current); - }); - return success; + if (current == 0x00) + { + return true; + } + *out++ = static_cast(current); + } + + return true; } bool parse_bson_entries(bool is_array) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index ac11591a..a661ecb6 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6109,36 +6109,27 @@ class binary_reader private: - template - OutputIt generate_until(OutputIt&& d_first, UnaryPredicate&& pred, Gen&& gen) - { - for (auto x = gen(); !pred(x); x = gen()) - { - *d_first++ = x; - } - - return d_first; - } - /*! @return whether array creation completed */ bool get_bson_cstr(string_t& result) { - bool success = true; - generate_until(std::back_inserter(result), [&success](char c) - { - return c == 0x00 || !success; - }, [this, &success] + auto out = std::back_inserter(result); + while (true) { get(); if (JSON_UNLIKELY(not unexpect_eof())) { - success = false; + return false; } - return static_cast(current); - }); - return success; + if (current == 0x00) + { + return true; + } + *out++ = static_cast(current); + } + + return true; } bool parse_bson_entries(bool is_array) From e8427061a0fe8faadd8c4cf8fd873fc32846de07 Mon Sep 17 00:00:00 2001 From: Gregorio Litenstein Date: Fri, 5 Oct 2018 02:01:43 -0300 Subject: [PATCH 19/77] Thirdparty benchmark: Fix Clang detection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CMake 3.0+ refers to macOS’ Clang as AppleClang, which would fail a STREQUAL check. Fixed by changing it to MATCHES. --- benchmarks/thirdparty/benchmark/CMakeLists.txt | 4 ++-- benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/benchmarks/thirdparty/benchmark/CMakeLists.txt b/benchmarks/thirdparty/benchmark/CMakeLists.txt index aa082676..f8dd0497 100644 --- a/benchmarks/thirdparty/benchmark/CMakeLists.txt +++ b/benchmarks/thirdparty/benchmark/CMakeLists.txt @@ -140,7 +140,7 @@ else() if (GCC_RANLIB) set(CMAKE_RANLIB ${GCC_RANLIB}) endif() - elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") + elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") include(llvm-toolchain) endif() endif() @@ -165,7 +165,7 @@ else() endif() if (BENCHMARK_USE_LIBCXX) - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") add_cxx_compiler_flag(-stdlib=libc++) elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") diff --git a/benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake b/benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake index 77ffc4c5..d38e7eb9 100644 --- a/benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake +++ b/benchmarks/thirdparty/benchmark/cmake/HandleGTest.cmake @@ -7,7 +7,7 @@ macro(build_external_gtest) include(ExternalProject) set(GTEST_FLAGS "") if (BENCHMARK_USE_LIBCXX) - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") list(APPEND GTEST_FLAGS -stdlib=libc++) else() message(WARNING "Unsupported compiler (${CMAKE_CXX_COMPILER}) when using libc++") From ec95438a59dcbac5e078f61fa73471c7ab8787a3 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 6 Oct 2018 13:49:02 +0200 Subject: [PATCH 20/77] :rotating_light: fixed some linter warnings --- include/nlohmann/detail/conversions/to_json.hpp | 2 +- include/nlohmann/detail/input/lexer.hpp | 2 +- include/nlohmann/detail/json_pointer.hpp | 4 ++-- include/nlohmann/detail/output/serializer.hpp | 2 +- single_include/nlohmann/json.hpp | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp index 0a802369..b944bf6c 100644 --- a/include/nlohmann/detail/conversions/to_json.hpp +++ b/include/nlohmann/detail/conversions/to_json.hpp @@ -306,7 +306,7 @@ void to_json(BasicJsonType& j, const std::pair& p) // for https://github.com/nlohmann/json/pull/1134 template::iteration_proxy_internal>::value, int> = 0> -void to_json(BasicJsonType& j, T b) noexcept +void to_json(BasicJsonType& j, const T& b) { j = {{b.key(), b.value()}}; } diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 44165ff0..b4ff65fb 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -709,7 +709,7 @@ class lexer locale's decimal point is used instead of `.` to work with the locale-dependent converters. */ - token_type scan_number() + token_type scan_number() // lgtm [cpp/use-of-goto] { // reset token_buffer to store the number's bytes reset(); diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index fce8001a..320730ec 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -506,11 +506,11 @@ class json_pointer std::size_t slash = reference_string.find_first_of('/', 1), // set the beginning of the first reference token start = 1; - // we can stop if start == string::npos+1 = 0 + // we can stop if start == 0 (if slash == std::string::npos) start != 0; // set the beginning of the next reference token // (will eventually be 0 if slash == std::string::npos) - start = slash + 1, + start = (slash == std::string::npos) ? 0 : slash + 1, // find next slash slash = reference_string.find_first_of('/', start)) { diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index e2655f04..d4a258da 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -442,7 +442,7 @@ class serializer return; } - const bool is_negative = not (x >= 0); // see issue #755 + const bool is_negative = std::is_same::value and not (x >= 0); // see issue #755 std::size_t i = 0; while (x != 0) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index c40620ad..d62638bd 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -1839,7 +1839,7 @@ void to_json(BasicJsonType& j, const std::pair& p) // for https://github.com/nlohmann/json/pull/1134 template::iteration_proxy_internal>::value, int> = 0> -void to_json(BasicJsonType& j, T b) noexcept +void to_json(BasicJsonType& j, const T& b) { j = {{b.key(), b.value()}}; } @@ -2976,7 +2976,7 @@ class lexer locale's decimal point is used instead of `.` to work with the locale-dependent converters. */ - token_type scan_number() + token_type scan_number() // lgtm [cpp/use-of-goto] { // reset token_buffer to store the number's bytes reset(); @@ -10157,7 +10157,7 @@ class serializer return; } - const bool is_negative = not (x >= 0); // see issue #755 + const bool is_negative = std::is_same::value and not (x >= 0); // see issue #755 std::size_t i = 0; while (x != 0) @@ -10922,11 +10922,11 @@ class json_pointer std::size_t slash = reference_string.find_first_of('/', 1), // set the beginning of the first reference token start = 1; - // we can stop if start == string::npos+1 = 0 + // we can stop if start == 0 (if slash == std::string::npos) start != 0; // set the beginning of the next reference token // (will eventually be 0 if slash == std::string::npos) - start = slash + 1, + start = (slash == std::string::npos) ? 0 : slash + 1, // find next slash slash = reference_string.find_first_of('/', start)) { From fa722d5ac39d63a65db0b7383494997b7e3fc70e Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 6 Oct 2018 16:26:47 +0200 Subject: [PATCH 21/77] :rotating_light: fixed another linter warning --- include/nlohmann/detail/input/binary_reader.hpp | 7 +++++-- single_include/nlohmann/json.hpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 05ab36f3..6d72cbf0 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -392,17 +392,20 @@ class binary_reader case 0xF9: // Half-Precision Float (two-byte IEEE 754) { - const int byte1 = get(); + const int byte1_raw = get(); if (JSON_UNLIKELY(not unexpect_eof())) { return false; } - const int byte2 = get(); + const int byte2_raw = get(); if (JSON_UNLIKELY(not unexpect_eof())) { return false; } + const unsigned char byte1 = static_cast(byte1_raw); + const unsigned char byte2 = static_cast(byte2_raw); + // code from RFC 7049, Appendix D, Figure 3: // As half-precision floating-point numbers were only added // to IEEE 754 in 2008, today's programming platforms often diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index d62638bd..a1a3d697 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6354,17 +6354,20 @@ class binary_reader case 0xF9: // Half-Precision Float (two-byte IEEE 754) { - const int byte1 = get(); + const int byte1_raw = get(); if (JSON_UNLIKELY(not unexpect_eof())) { return false; } - const int byte2 = get(); + const int byte2_raw = get(); if (JSON_UNLIKELY(not unexpect_eof())) { return false; } + const unsigned char byte1 = static_cast(byte1_raw); + const unsigned char byte2 = static_cast(byte2_raw); + // code from RFC 7049, Appendix D, Figure 3: // As half-precision floating-point numbers were only added // to IEEE 754 in 2008, today's programming platforms often From 81f4b34e068df134447c2e13fd05fd4c23f8018f Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sun, 7 Oct 2018 07:52:12 +0200 Subject: [PATCH 22/77] BSON: Improved documentation and error handling/reporting --- include/nlohmann/detail/exceptions.hpp | 1 + .../nlohmann/detail/input/binary_reader.hpp | 179 ++++++++---- .../nlohmann/detail/output/binary_writer.hpp | 2 +- include/nlohmann/json.hpp | 79 +++++- single_include/nlohmann/json.hpp | 261 ++++++++++++++---- test/src/unit-bson.cpp | 19 ++ 6 files changed, 421 insertions(+), 120 deletions(-) diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index 274a88c7..7edc0032 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -91,6 +91,7 @@ json.exception.parse_error.109 | parse error: array index 'one' is not a number json.exception.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.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read. json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read. +json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet). @note For an input with n bytes, 1 is the index of the first character and n+1 is the index of the terminating null byte or the end of file. This also diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 0b718dd4..2b3ff1ab 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -126,7 +126,12 @@ class binary_reader private: /*! - @return whether array creation completed + @brief Parses a C-style string from the BSON input. + @param [out] result A reference to the string variable where the read string + is to be stored. + @return `true` if the \x00-byte indicating the end of the + string was encountered before the EOF. + `false` indicates an unexpected EOF. */ bool get_bson_cstr(string_t& result) { @@ -148,12 +153,112 @@ class binary_reader return true; } - bool parse_bson_entries(bool is_array) + /*! + @brief Parses a zero-terminated string of length @a len from the BSON input. + @param [in] len The length (including the zero-byte at the end) of the string to be read. + @param [out] result A reference to the string variable where the read string + is to be stored. + @tparam NumberType The type of the length @a len + @pre len > 0 + @return `true` if the string was successfully parsed + */ + template + bool get_bson_string(const NumberType len, string_t& result) { - while (auto entry_type = get()) + return get_string(len - static_cast(1), result) + && get() != std::char_traits::eof(); + } + + /*! + @return A hexadecimal string representation of the given @a byte + @param byte The byte to convert to a string + */ + static std::string byte_hexstring(unsigned char byte) + { + char cr[3]; + snprintf(cr, sizeof(cr), "%02hhX", byte); + return std::string{cr}; + } + + /*! + @brief Read a BSON document element of the given @a element_type. + @param element_type The BSON element type, c.f. http://bsonspec.org/spec.html + @param element_type_parse_position The position in the input stream, where the `element_type` was read. + @warning Not all BSON element types are supported yet. An unsupported @a element_type will + give rise to a parse_error.114: Unsupported BSON record type 0x... + @return whether a valid BSON-object/array was passed to the SAX parser + */ + bool parse_bson_element_internal(int element_type, std::size_t element_type_parse_position) + { + switch (element_type) { + case 0x01: // double + { + double number; + return get_number(number) + && sax->number_float(static_cast(number), ""); + } + case 0x02: // string + { + std::int32_t len; + string_t value; + return get_number(len) + && get_bson_string(len, value) + && sax->string(value); + } + case 0x08: // boolean + { + return sax->boolean(static_cast(get())); + } + case 0x10: // int32 + { + std::int32_t value; + return get_number(value) + && sax->number_integer(static_cast(value)); + } + case 0x12: // int64 + { + std::int64_t value; + return get_number(value) + && sax->number_integer(static_cast(value)); + } + case 0x0A: // null + { + return sax->null(); + } + case 0x03: // object + { + return parse_bson_internal(); + } + case 0x04: // array + { + return parse_bson_array(); + } + default: // anything else not supported (yet) + { + auto element_type_str = byte_hexstring(element_type); + return sax->parse_error(element_type_parse_position, element_type_str, parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + element_type_str)); + } + } + } + + /*! + @brief Read a BSON element list (as specified in the BSON-spec) from the input + and passes it to the SAX-parser. + The same binary layout is used for objects and arrays, hence it must + be indicated with the argument @a is_array which one is expected + (true --> array, false --> object). + @param is_array Determines if the element list being read is to be treated as + an object (@a is_array == false), or as an array (@a is_array == true). + @return whether a valid BSON-object/array was passed to the SAX parser + */ + bool parse_bson_element_list(bool is_array) + { + while (auto element_type = get()) + { + const std::size_t element_type_parse_position = chars_read; string_t key; - if (!get_bson_cstr(key)) + if (JSON_UNLIKELY(not get_bson_cstr(key))) { return false; } @@ -163,64 +268,18 @@ class binary_reader sax->key(key); } - switch (entry_type) + if (JSON_UNLIKELY(not parse_bson_element_internal(element_type, element_type_parse_position))) { - case 0x01: // double - { - double number; - get_number(number); - sax->number_float(static_cast(number), ""); - } - break; - case 0x02: // string - { - std::int32_t len; - string_t value; - get_number(len); - get_string(len - 1ul, value); - get(); - sax->string(value); - } - break; - case 0x08: // boolean - { - sax->boolean(static_cast(get())); - } - break; - case 0x10: // int32 - { - std::int32_t value; - get_number(value); - sax->number_integer(static_cast(value)); - } - break; - case 0x12: // int64 - { - std::int64_t value; - get_number(value); - sax->number_integer(static_cast(value)); - } - break; - case 0x0A: // null - { - sax->null(); - } - break; - case 0x03: // object - { - parse_bson_internal(); - } - break; - case 0x04: // array - { - parse_bson_array(); - } - break; + return false; } } return true; } + /*! + @brief Reads an array from the BSON input and passes it to the SAX-parser. + @return whether a valid BSON-array was passed to the SAX parser + */ bool parse_bson_array() { std::int32_t documentSize; @@ -231,7 +290,7 @@ class binary_reader return false; } - if (!parse_bson_entries(/*is_array*/true)) + if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/true))) { return false; } @@ -239,6 +298,10 @@ class binary_reader return sax->end_array(); } + /*! + @brief Reads in a BSON-object and pass it to the SAX-parser. + @return whether a valid BSON-value was passed to the SAX parser + */ bool parse_bson_internal() { std::int32_t documentSize; @@ -249,7 +312,7 @@ class binary_reader return false; } - if (!parse_bson_entries(/*is_array*/false)) + if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/false))) { return false; } diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index d9655f93..363bb9b2 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -868,7 +868,7 @@ class binary_writer switch (j.type()) { default: - JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); + JSON_THROW(type_error::create(317, "JSON value of type " + std::to_string(static_cast(j.type())) + " cannot be serialized to requested format")); break; case value_t::discarded: break; diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 8b6a0170..c5d2e0db 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -6591,7 +6591,13 @@ class basic_json } - + /*! + @brief Serializes the given JSON object `j` to BSON and returns a vector + containing the corresponding BSON-representation. + @param j The JSON object to convert to BSON. + @return The BSON representation of the JSON input `j`. + @pre The input `j` shall be an object: `j.is_object() == true` + */ static std::vector to_bson(const basic_json& j) { std::vector result; @@ -6599,11 +6605,21 @@ class basic_json return result; } + /*! + @brief Serializes the given JSON object `j` to BSON and forwards the + corresponding BSON-representation to the given output_adapter `o`. + @param j The JSON object to convert to BSON. + @param o The output adapter that receives the binary BSON representation. + @pre The input `j` shall be an object: `j.is_object() == true` + */ static void to_bson(const basic_json& j, detail::output_adapter o) { binary_writer(o).write_bson(j); } + /*! + @copydoc to_bson(const basic_json&, detail::output_adapter) + */ static void to_bson(const basic_json& j, detail::output_adapter o) { binary_writer(o).write_bson(j); @@ -6804,6 +6820,8 @@ class basic_json related CBOR format @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the related UBJSON format + @sa @ref from_bson(detail::input_adapter, const bool, const bool) for + the related BSON format @since version 2.0.9; parameter @a start_index since 2.1.1; changed to consume input adapters, removed start_index parameter, and added @@ -6889,6 +6907,8 @@ class basic_json related CBOR format @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for the related MessagePack format + @sa @ref from_bson(detail::input_adapter, const bool, const bool) for + the related BSON format @since version 3.1.0; added @allow_exceptions parameter since 3.2.0 */ @@ -6920,7 +6940,61 @@ class basic_json + /*! + @brief Create a JSON value from an input in BSON format + Deserializes a given input @a i to a JSON value using the BSON (Binary JSON) + serialization format. + + The library maps BSON record types to JSON value types as follows: + + BSON type | BSON marker byte | JSON value type + --------------- | ---------------- | --------------------------- + double | 0x01 | number_float + string | 0x02 | string + document | 0x03 | object + array | 0x04 | array + binary | 0x05 | still unsupported + undefined | 0x06 | still unsupported + ObjectId | 0x07 | still unsupported + boolean | 0x08 | boolean + UTC Date-Time | 0x09 | still unsupported + null | 0x0A | null + Regular Expr. | 0x0B | still unsupported + DB Pointer | 0x0C | still unsupported + JavaScript Code | 0x0D | still unsupported + Symbol | 0x0E | still unsupported + JavaScript Code | 0x0F | still unsupported + int32 | 0x10 | number_integer + Timestamp | 0x11 | still unsupported + 128-bit decimal float | 0x13 | still unsupported + Max Key | 0x7F | still unsupported + Min Key | 0xFF | still unsupported + + + @warning The mapping is **incomplete**. The unsupported mappings + are indicated in the table above. + + @param[in] i an input in BSON format convertible to an input adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + + @return deserialized JSON value + + @throw parse_error.114 if an unsupported BSON record type is encountered + + @sa http://bsonspec.org/spec.html + @sa @ref to_bson(const basic_json&, const bool, const bool) for the + analogous serialization + @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the + related CBOR format + @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for + the related MessagePack format + @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the + related UBJSON format + */ static basic_json from_bson(detail::input_adapter&& i, const bool strict = true, const bool allow_exceptions = true) @@ -6931,6 +7005,9 @@ class basic_json return res ? result : basic_json(value_t::discarded); } + /*! + @copydoc from_bson(detail::input_adapter&&, const bool, const bool) + */ template::value, int> = 0> static basic_json from_bson(A1 && a1, A2 && a2, diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index a661ecb6..52fd79ca 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -690,6 +690,7 @@ json.exception.parse_error.109 | parse error: array index 'one' is not a number json.exception.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.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read. json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read. +json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet). @note For an input with n bytes, 1 is the index of the first character and n+1 is the index of the terminating null byte or the end of file. This also @@ -6110,7 +6111,12 @@ class binary_reader private: /*! - @return whether array creation completed + @brief Parses a C-style string from the BSON input. + @param [out] result A reference to the string variable where the read string + is to be stored. + @return `true` if the \x00-byte indicating the end of the + string was encountered before the EOF. + `false` indicates an unexpected EOF. */ bool get_bson_cstr(string_t& result) { @@ -6132,12 +6138,112 @@ class binary_reader return true; } - bool parse_bson_entries(bool is_array) + /*! + @brief Parses a zero-terminated string of length @a len from the BSON input. + @param [in] len The length (including the zero-byte at the end) of the string to be read. + @param [out] result A reference to the string variable where the read string + is to be stored. + @tparam NumberType The type of the length @a len + @pre len > 0 + @return `true` if the string was successfully parsed + */ + template + bool get_bson_string(const NumberType len, string_t& result) { - while (auto entry_type = get()) + return get_string(len - static_cast(1), result) + && get() != std::char_traits::eof(); + } + + /*! + @return A hexadecimal string representation of the given @a byte + @param byte The byte to convert to a string + */ + static std::string byte_hexstring(unsigned char byte) + { + char cr[3]; + snprintf(cr, sizeof(cr), "%02hhX", byte); + return std::string{cr}; + } + + /*! + @brief Read a BSON document element of the given @a element_type. + @param element_type The BSON element type, c.f. http://bsonspec.org/spec.html + @param element_type_parse_position The position in the input stream, where the `element_type` was read. + @warning Not all BSON element types are supported yet. An unsupported @a element_type will + give rise to a parse_error.114: Unsupported BSON record type 0x... + @return whether a valid BSON-object/array was passed to the SAX parser + */ + bool parse_bson_element_internal(int element_type, std::size_t element_type_parse_position) + { + switch (element_type) { + case 0x01: // double + { + double number; + return get_number(number) + && sax->number_float(static_cast(number), ""); + } + case 0x02: // string + { + std::int32_t len; + string_t value; + return get_number(len) + && get_bson_string(len, value) + && sax->string(value); + } + case 0x08: // boolean + { + return sax->boolean(static_cast(get())); + } + case 0x10: // int32 + { + std::int32_t value; + return get_number(value) + && sax->number_integer(static_cast(value)); + } + case 0x12: // int64 + { + std::int64_t value; + return get_number(value) + && sax->number_integer(static_cast(value)); + } + case 0x0A: // null + { + return sax->null(); + } + case 0x03: // object + { + return parse_bson_internal(); + } + case 0x04: // array + { + return parse_bson_array(); + } + default: // anything else not supported (yet) + { + auto element_type_str = byte_hexstring(element_type); + return sax->parse_error(element_type_parse_position, element_type_str, parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + element_type_str)); + } + } + } + + /*! + @brief Read a BSON element list (as specified in the BSON-spec) from the input + and passes it to the SAX-parser. + The same binary layout is used for objects and arrays, hence it must + be indicated with the argument @a is_array which one is expected + (true --> array, false --> object). + @param is_array Determines if the element list being read is to be treated as + an object (@a is_array == false), or as an array (@a is_array == true). + @return whether a valid BSON-object/array was passed to the SAX parser + */ + bool parse_bson_element_list(bool is_array) + { + while (auto element_type = get()) + { + const std::size_t element_type_parse_position = chars_read; string_t key; - if (!get_bson_cstr(key)) + if (JSON_UNLIKELY(not get_bson_cstr(key))) { return false; } @@ -6147,64 +6253,18 @@ class binary_reader sax->key(key); } - switch (entry_type) + if (JSON_UNLIKELY(not parse_bson_element_internal(element_type, element_type_parse_position))) { - case 0x01: // double - { - double number; - get_number(number); - sax->number_float(static_cast(number), ""); - } - break; - case 0x02: // string - { - std::int32_t len; - string_t value; - get_number(len); - get_string(len - 1ul, value); - get(); - sax->string(value); - } - break; - case 0x08: // boolean - { - sax->boolean(static_cast(get())); - } - break; - case 0x10: // int32 - { - std::int32_t value; - get_number(value); - sax->number_integer(static_cast(value)); - } - break; - case 0x12: // int64 - { - std::int64_t value; - get_number(value); - sax->number_integer(static_cast(value)); - } - break; - case 0x0A: // null - { - sax->null(); - } - break; - case 0x03: // object - { - parse_bson_internal(); - } - break; - case 0x04: // array - { - parse_bson_array(); - } - break; + return false; } } return true; } + /*! + @brief Reads an array from the BSON input and passes it to the SAX-parser. + @return whether a valid BSON-array was passed to the SAX parser + */ bool parse_bson_array() { std::int32_t documentSize; @@ -6215,7 +6275,7 @@ class binary_reader return false; } - if (!parse_bson_entries(/*is_array*/true)) + if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/true))) { return false; } @@ -6223,6 +6283,10 @@ class binary_reader return sax->end_array(); } + /*! + @brief Reads in a BSON-object and pass it to the SAX-parser. + @return whether a valid BSON-value was passed to the SAX parser + */ bool parse_bson_internal() { std::int32_t documentSize; @@ -6233,7 +6297,7 @@ class binary_reader return false; } - if (!parse_bson_entries(/*is_array*/false)) + if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/false))) { return false; } @@ -8691,7 +8755,7 @@ class binary_writer switch (j.type()) { default: - JSON_THROW(type_error::create(317, "JSON value cannot be serialized to requested format")); + JSON_THROW(type_error::create(317, "JSON value of type " + std::to_string(static_cast(j.type())) + " cannot be serialized to requested format")); break; case value_t::discarded: break; @@ -18080,7 +18144,13 @@ class basic_json } - + /*! + @brief Serializes the given JSON object `j` to BSON and returns a vector + containing the corresponding BSON-representation. + @param j The JSON object to convert to BSON. + @return The BSON representation of the JSON input `j`. + @pre The input `j` shall be an object: `j.is_object() == true` + */ static std::vector to_bson(const basic_json& j) { std::vector result; @@ -18088,11 +18158,21 @@ class basic_json return result; } + /*! + @brief Serializes the given JSON object `j` to BSON and forwards the + corresponding BSON-representation to the given output_adapter `o`. + @param j The JSON object to convert to BSON. + @param o The output adapter that receives the binary BSON representation. + @pre The input `j` shall be an object: `j.is_object() == true` + */ static void to_bson(const basic_json& j, detail::output_adapter o) { binary_writer(o).write_bson(j); } + /*! + @copydoc to_bson(const basic_json&, detail::output_adapter) + */ static void to_bson(const basic_json& j, detail::output_adapter o) { binary_writer(o).write_bson(j); @@ -18293,6 +18373,8 @@ class basic_json related CBOR format @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the related UBJSON format + @sa @ref from_bson(detail::input_adapter, const bool, const bool) for + the related BSON format @since version 2.0.9; parameter @a start_index since 2.1.1; changed to consume input adapters, removed start_index parameter, and added @@ -18378,6 +18460,8 @@ class basic_json related CBOR format @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for the related MessagePack format + @sa @ref from_bson(detail::input_adapter, const bool, const bool) for + the related BSON format @since version 3.1.0; added @allow_exceptions parameter since 3.2.0 */ @@ -18409,7 +18493,61 @@ class basic_json + /*! + @brief Create a JSON value from an input in BSON format + Deserializes a given input @a i to a JSON value using the BSON (Binary JSON) + serialization format. + + The library maps BSON record types to JSON value types as follows: + + BSON type | BSON marker byte | JSON value type + --------------- | ---------------- | --------------------------- + double | 0x01 | number_float + string | 0x02 | string + document | 0x03 | object + array | 0x04 | array + binary | 0x05 | still unsupported + undefined | 0x06 | still unsupported + ObjectId | 0x07 | still unsupported + boolean | 0x08 | boolean + UTC Date-Time | 0x09 | still unsupported + null | 0x0A | null + Regular Expr. | 0x0B | still unsupported + DB Pointer | 0x0C | still unsupported + JavaScript Code | 0x0D | still unsupported + Symbol | 0x0E | still unsupported + JavaScript Code | 0x0F | still unsupported + int32 | 0x10 | number_integer + Timestamp | 0x11 | still unsupported + 128-bit decimal float | 0x13 | still unsupported + Max Key | 0x7F | still unsupported + Min Key | 0xFF | still unsupported + + + @warning The mapping is **incomplete**. The unsupported mappings + are indicated in the table above. + + @param[in] i an input in BSON format convertible to an input adapter + @param[in] strict whether to expect the input to be consumed until EOF + (true by default) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) + + @return deserialized JSON value + + @throw parse_error.114 if an unsupported BSON record type is encountered + + @sa http://bsonspec.org/spec.html + @sa @ref to_bson(const basic_json&, const bool, const bool) for the + analogous serialization + @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the + related CBOR format + @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for + the related MessagePack format + @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the + related UBJSON format + */ static basic_json from_bson(detail::input_adapter&& i, const bool strict = true, const bool allow_exceptions = true) @@ -18420,6 +18558,9 @@ class basic_json return res ? result : basic_json(value_t::discarded); } + /*! + @copydoc from_bson(detail::input_adapter&&, const bool, const bool) + */ template::value, int> = 0> static basic_json from_bson(A1 && a1, A2 && a2, diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index cbb6785e..33ef25c4 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -708,3 +708,22 @@ TEST_CASE("Incomplete BSON INPUT 4") } +TEST_CASE("Unsupported BSON input") +{ + std::vector bson = + { + 0x0C, 0x00, 0x00, 0x00, // size (little endian) + 0xFF, // entry type: Min key (not supported yet) + 'e', 'n', 't', 'r', 'y', '\x00', + 0x00 // end marker + }; + + CHECK_THROWS_WITH(json::from_bson(bson), + "[json.exception.parse_error.114] parse error at 5: Unsupported BSON record type 0xFF"); + CHECK(json::from_bson(bson, true, false).is_discarded()); + + SaxCountdown scp(0); + CHECK(not json::sax_parse(bson, &scp, json::input_format_t::bson)); +} + + From 011b15dd08126b6dde8ae819ed32c90aedb71508 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 7 Oct 2018 12:27:24 +0200 Subject: [PATCH 23/77] :wheelchair: added line positions to error messages This is a follow-up to #1210. --- Makefile | 1 + include/nlohmann/detail/exceptions.hpp | 27 +- include/nlohmann/detail/input/lexer.hpp | 196 ++++++++++++++- include/nlohmann/detail/input/position_t.hpp | 27 ++ single_include/nlohmann/json.hpp | 252 +++++++++++++++++-- test/src/unit-cbor.cpp | 62 ++--- test/src/unit-class_parser.cpp | 234 ++++++++--------- test/src/unit-deserialization.cpp | 24 +- test/src/unit-json_pointer.cpp | 2 +- test/src/unit-msgpack.cpp | 48 ++-- test/src/unit-regression.cpp | 56 ++--- test/src/unit-ubjson.cpp | 60 ++--- test/src/unit-unicode.cpp | 14 +- 13 files changed, 725 insertions(+), 278 deletions(-) create mode 100644 include/nlohmann/detail/input/position_t.hpp diff --git a/Makefile b/Makefile index bfb62349..135db65a 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ SRCS = include/nlohmann/json.hpp \ include/nlohmann/detail/input/json_sax.hpp \ include/nlohmann/detail/input/lexer.hpp \ include/nlohmann/detail/input/parser.hpp \ + include/nlohmann/detail/input/position_t.hpp \ include/nlohmann/detail/iterators/internal_iterator.hpp \ include/nlohmann/detail/iterators/iter_impl.hpp \ include/nlohmann/detail/iterators/iteration_proxy.hpp \ diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index b73d7b1f..a26e30f3 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -4,6 +4,8 @@ #include // runtime_error #include // to_string +#include + namespace nlohmann { namespace detail @@ -114,15 +116,23 @@ class parse_error : public exception /*! @brief create a parse error exception @param[in] id_ the id of the exception - @param[in] byte_ the byte index where the error occurred (or 0 if the - position cannot be determined) + @param[in] position the position where the error occurred (or with + chars_read_total=0 if the position cannot be + determined) @param[in] what_arg the explanatory string @return parse_error object */ + static parse_error create(int id_, const position_t& pos, const std::string& what_arg) + { + std::string w = exception::name("parse_error", id_) + "parse error" + + position_string(pos) + ": " + what_arg; + return parse_error(id_, pos.chars_read_total, w.c_str()); + } + static parse_error create(int id_, std::size_t byte_, const std::string& what_arg) { std::string w = exception::name("parse_error", id_) + "parse error" + - (byte_ != 0 ? (" at " + std::to_string(byte_)) : "") + + (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + ": " + what_arg; return parse_error(id_, byte_, w.c_str()); } @@ -141,6 +151,17 @@ class parse_error : public exception private: parse_error(int id_, std::size_t byte_, const char* what_arg) : exception(id_, what_arg), byte(byte_) {} + + static std::string position_string(const position_t& pos) + { + if (pos.chars_read_total == 0) + { + return ""; + } + + return " at line " + std::to_string(pos.lines_read + 1) + + ", column " + std::to_string(pos.chars_read_current_line); + } }; /*! diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 44165ff0..815cac81 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -10,6 +10,7 @@ #include #include +#include namespace nlohmann { @@ -393,39 +394,194 @@ class lexer // invalid control characters case 0x00: + { + error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000"; + return token_type::parse_error; + } + case 0x01: + { + error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001"; + return token_type::parse_error; + } + case 0x02: + { + error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002"; + return token_type::parse_error; + } + case 0x03: + { + error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003"; + return token_type::parse_error; + } + case 0x04: + { + error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004"; + return token_type::parse_error; + } + case 0x05: + { + error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005"; + return token_type::parse_error; + } + case 0x06: + { + error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006"; + return token_type::parse_error; + } + case 0x07: + { + error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007"; + return token_type::parse_error; + } + case 0x08: + { + error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b"; + return token_type::parse_error; + } + case 0x09: + { + error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t"; + return token_type::parse_error; + } + case 0x0A: + { + error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n"; + return token_type::parse_error; + } + case 0x0B: + { + error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B"; + return token_type::parse_error; + } + case 0x0C: + { + error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f"; + return token_type::parse_error; + } + case 0x0D: + { + error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r"; + return token_type::parse_error; + } + case 0x0E: + { + error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E"; + return token_type::parse_error; + } + case 0x0F: + { + error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F"; + return token_type::parse_error; + } + case 0x10: + { + error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010"; + return token_type::parse_error; + } + case 0x11: + { + error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011"; + return token_type::parse_error; + } + case 0x12: + { + error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012"; + return token_type::parse_error; + } + case 0x13: + { + error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013"; + return token_type::parse_error; + } + case 0x14: + { + error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014"; + return token_type::parse_error; + } + case 0x15: + { + error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015"; + return token_type::parse_error; + } + case 0x16: + { + error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016"; + return token_type::parse_error; + } + case 0x17: + { + error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017"; + return token_type::parse_error; + } + case 0x18: + { + error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018"; + return token_type::parse_error; + } + case 0x19: + { + error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019"; + return token_type::parse_error; + } + case 0x1A: + { + error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A"; + return token_type::parse_error; + } + case 0x1B: + { + error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B"; + return token_type::parse_error; + } + case 0x1C: + { + error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C"; + return token_type::parse_error; + } + case 0x1D: + { + error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D"; + return token_type::parse_error; + } + case 0x1E: + { + error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E"; + return token_type::parse_error; + } + case 0x1F: { - error_message = "invalid string: control character must be escaped"; + error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F"; return token_type::parse_error; } @@ -1082,7 +1238,9 @@ scan_number_done: */ std::char_traits::int_type get() { - ++chars_read; + ++position.chars_read_total; + ++position.chars_read_current_line; + if (next_unget) { // just reset the next_unget variable and work with current @@ -1097,6 +1255,13 @@ scan_number_done: { token_string.push_back(std::char_traits::to_char_type(current)); } + + if (current == '\n') + { + ++position.lines_read; + ++position.chars_read_current_line = 0; + } + return current; } @@ -1104,14 +1269,23 @@ scan_number_done: @brief unget current character (read it again on next get) We implement unget by setting variable next_unget to true. The input is not - changed - we just simulate ungetting by modifying chars_read and - token_string. The next call to get() will behave as if the unget character - is read again. + changed - we just simulate ungetting by modifying chars_read_total, + chars_read_current_line, and token_string. The next call to get() will + behave as if the unget character is read again. */ void unget() { next_unget = true; - --chars_read; + + --position.chars_read_total; + --position.chars_read_current_line; + + // in case we "unget" a newline, we have to also decrement the lines_read + if (position.lines_read != 0 and position.chars_read_current_line == 0) + { + --position.lines_read; + } + if (JSON_LIKELY(current != std::char_traits::eof())) { assert(token_string.size() != 0); @@ -1159,9 +1333,9 @@ scan_number_done: ///////////////////// /// return position of last read token - constexpr std::size_t get_position() const noexcept + constexpr position_t get_position() const noexcept { - return chars_read; + return position; } /// return the last read token (for errors only). Will never contain EOF @@ -1231,7 +1405,7 @@ scan_number_done: token_type scan() { // initially, skip the BOM - if (chars_read == 0 and not skip_bom()) + if (position.chars_read_total == 0 and not skip_bom()) { error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given"; return token_type::parse_error; @@ -1309,8 +1483,8 @@ scan_number_done: /// whether the next get() call should just return current bool next_unget = false; - /// the number of characters read - std::size_t chars_read = 0; + /// the start position of the current token + position_t position; /// raw input token string (for error messages) std::vector token_string {}; diff --git a/include/nlohmann/detail/input/position_t.hpp b/include/nlohmann/detail/input/position_t.hpp new file mode 100644 index 00000000..37f4ab15 --- /dev/null +++ b/include/nlohmann/detail/input/position_t.hpp @@ -0,0 +1,27 @@ +#pragma once + +#include // size_t + +namespace nlohmann +{ +namespace detail +{ +/// struct to capture the start position of the current token +struct position_t +{ + /// the total number of characters read + std::size_t chars_read_total = 0; + /// the number of characters read in the current line + std::size_t chars_read_current_line = 0; + /// the number of lines read + std::size_t lines_read = 0; + + /// conversion to size_t to preserve SAX interface + constexpr operator size_t() const + { + return chars_read_total; + } +}; + +} +} diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index c40620ad..957cfc24 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -617,6 +617,36 @@ struct is_compatible_type #include // runtime_error #include // to_string +// #include + + +#include // size_t + +namespace nlohmann +{ +namespace detail +{ +/// struct to capture the start position of the current token +struct position_t +{ + /// the total number of characters read + std::size_t chars_read_total = 0; + /// the number of characters read in the current line + std::size_t chars_read_current_line = 0; + /// the number of lines read + std::size_t lines_read = 0; + + /// conversion to size_t to preserve SAX interface + constexpr operator size_t() const + { + return chars_read_total; + } +}; + +} +} + + namespace nlohmann { namespace detail @@ -727,15 +757,23 @@ class parse_error : public exception /*! @brief create a parse error exception @param[in] id_ the id of the exception - @param[in] byte_ the byte index where the error occurred (or 0 if the - position cannot be determined) + @param[in] position the position where the error occurred (or with + chars_read_total=0 if the position cannot be + determined) @param[in] what_arg the explanatory string @return parse_error object */ + static parse_error create(int id_, const position_t& pos, const std::string& what_arg) + { + std::string w = exception::name("parse_error", id_) + "parse error" + + position_string(pos) + ": " + what_arg; + return parse_error(id_, pos.chars_read_total, w.c_str()); + } + static parse_error create(int id_, std::size_t byte_, const std::string& what_arg) { std::string w = exception::name("parse_error", id_) + "parse error" + - (byte_ != 0 ? (" at " + std::to_string(byte_)) : "") + + (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") + ": " + what_arg; return parse_error(id_, byte_, w.c_str()); } @@ -754,6 +792,17 @@ class parse_error : public exception private: parse_error(int id_, std::size_t byte_, const char* what_arg) : exception(id_, what_arg), byte(byte_) {} + + static std::string position_string(const position_t& pos) + { + if (pos.chars_read_total == 0) + { + return ""; + } + + return " at line " + std::to_string(pos.lines_read + 1) + + ", column " + std::to_string(pos.chars_read_current_line); + } }; /*! @@ -2277,6 +2326,8 @@ class input_adapter // #include +// #include + namespace nlohmann { @@ -2660,39 +2711,194 @@ class lexer // invalid control characters case 0x00: + { + error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000"; + return token_type::parse_error; + } + case 0x01: + { + error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001"; + return token_type::parse_error; + } + case 0x02: + { + error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002"; + return token_type::parse_error; + } + case 0x03: + { + error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003"; + return token_type::parse_error; + } + case 0x04: + { + error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004"; + return token_type::parse_error; + } + case 0x05: + { + error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005"; + return token_type::parse_error; + } + case 0x06: + { + error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006"; + return token_type::parse_error; + } + case 0x07: + { + error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007"; + return token_type::parse_error; + } + case 0x08: + { + error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b"; + return token_type::parse_error; + } + case 0x09: + { + error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t"; + return token_type::parse_error; + } + case 0x0A: + { + error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n"; + return token_type::parse_error; + } + case 0x0B: + { + error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B"; + return token_type::parse_error; + } + case 0x0C: + { + error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f"; + return token_type::parse_error; + } + case 0x0D: + { + error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r"; + return token_type::parse_error; + } + case 0x0E: + { + error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E"; + return token_type::parse_error; + } + case 0x0F: + { + error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F"; + return token_type::parse_error; + } + case 0x10: + { + error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010"; + return token_type::parse_error; + } + case 0x11: + { + error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011"; + return token_type::parse_error; + } + case 0x12: + { + error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012"; + return token_type::parse_error; + } + case 0x13: + { + error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013"; + return token_type::parse_error; + } + case 0x14: + { + error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014"; + return token_type::parse_error; + } + case 0x15: + { + error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015"; + return token_type::parse_error; + } + case 0x16: + { + error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016"; + return token_type::parse_error; + } + case 0x17: + { + error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017"; + return token_type::parse_error; + } + case 0x18: + { + error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018"; + return token_type::parse_error; + } + case 0x19: + { + error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019"; + return token_type::parse_error; + } + case 0x1A: + { + error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A"; + return token_type::parse_error; + } + case 0x1B: + { + error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B"; + return token_type::parse_error; + } + case 0x1C: + { + error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C"; + return token_type::parse_error; + } + case 0x1D: + { + error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D"; + return token_type::parse_error; + } + case 0x1E: + { + error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E"; + return token_type::parse_error; + } + case 0x1F: { - error_message = "invalid string: control character must be escaped"; + error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F"; return token_type::parse_error; } @@ -3349,7 +3555,9 @@ scan_number_done: */ std::char_traits::int_type get() { - ++chars_read; + ++position.chars_read_total; + ++position.chars_read_current_line; + if (next_unget) { // just reset the next_unget variable and work with current @@ -3364,6 +3572,13 @@ scan_number_done: { token_string.push_back(std::char_traits::to_char_type(current)); } + + if (current == '\n') + { + ++position.lines_read; + ++position.chars_read_current_line = 0; + } + return current; } @@ -3371,14 +3586,23 @@ scan_number_done: @brief unget current character (read it again on next get) We implement unget by setting variable next_unget to true. The input is not - changed - we just simulate ungetting by modifying chars_read and - token_string. The next call to get() will behave as if the unget character - is read again. + changed - we just simulate ungetting by modifying chars_read_total, + chars_read_current_line, and token_string. The next call to get() will + behave as if the unget character is read again. */ void unget() { next_unget = true; - --chars_read; + + --position.chars_read_total; + --position.chars_read_current_line; + + // in case we "unget" a newline, we have to also decrement the lines_read + if (position.lines_read != 0 and position.chars_read_current_line == 0) + { + --position.lines_read; + } + if (JSON_LIKELY(current != std::char_traits::eof())) { assert(token_string.size() != 0); @@ -3426,9 +3650,9 @@ scan_number_done: ///////////////////// /// return position of last read token - constexpr std::size_t get_position() const noexcept + constexpr position_t get_position() const noexcept { - return chars_read; + return position; } /// return the last read token (for errors only). Will never contain EOF @@ -3498,7 +3722,7 @@ scan_number_done: token_type scan() { // initially, skip the BOM - if (chars_read == 0 and not skip_bom()) + if (position.chars_read_total == 0 and not skip_bom()) { error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given"; return token_type::parse_error; @@ -3576,8 +3800,8 @@ scan_number_done: /// whether the next get() call should just return current bool next_unget = false; - /// the number of characters read - std::size_t chars_read = 0; + /// the start position of the current token + position_t position; /// raw input token string (for error messages) std::vector token_string {}; diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp index 0d2ca939..62520a0b 100644 --- a/test/src/unit-cbor.cpp +++ b/test/src/unit-cbor.cpp @@ -831,14 +831,14 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(std::vector({0xf9})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xf9})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK(json::from_cbor(std::vector({0xf9}), true, false).is_discarded()); } SECTION("only one byte follows") { CHECK_THROWS_AS(json::from_cbor(std::vector({0xf9, 0x7c})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xf9, 0x7c})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK(json::from_cbor(std::vector({0xf9, 0x7c}), true, false).is_discarded()); } } @@ -1314,7 +1314,7 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(std::vector()), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector()), - "[json.exception.parse_error.110] parse error at 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); CHECK(json::from_cbor(std::vector(), true, false).is_discarded()); } @@ -1346,53 +1346,53 @@ TEST_CASE("CBOR") CHECK_THROWS_AS(json::from_cbor(std::vector({0xBF, 0x61, 0X61})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x18})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x19})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x19, 0x00})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1a})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1a, 0x00})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1a, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1a, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 6: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 6: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 7: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 7: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 8: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 9: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 9: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x62})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x62, 0x60})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x7F})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x7F, 0x60})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x82, 0x01})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x9F, 0x01})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xBF, 0x61, 0x61, 0xF5})), - "[json.exception.parse_error.110] parse error at 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xA1, 0x61, 0x61})), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xBF, 0x61, 0x61})), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_cbor(std::vector({0x18}), true, false).is_discarded()); CHECK(json::from_cbor(std::vector({0x19}), true, false).is_discarded()); @@ -1426,12 +1426,12 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(std::vector({0x1c})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1c})), - "[json.exception.parse_error.112] parse error at 1: error reading CBOR; last byte: 0x1C"); + "[json.exception.parse_error.112] parse error at byte 1: error reading CBOR; last byte: 0x1C"); CHECK(json::from_cbor(std::vector({0x1c}), true, false).is_discarded()); CHECK_THROWS_AS(json::from_cbor(std::vector({0xf8})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xf8})), - "[json.exception.parse_error.112] parse error at 1: error reading CBOR; last byte: 0xF8"); + "[json.exception.parse_error.112] parse error at byte 1: error reading CBOR; last byte: 0xF8"); CHECK(json::from_cbor(std::vector({0xf8}), true, false).is_discarded()); } @@ -1491,7 +1491,7 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(std::vector({0xa1, 0xff, 0x01})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xa1, 0xff, 0x01})), - "[json.exception.parse_error.113] parse error at 2: expected a CBOR string; last byte: 0xFF"); + "[json.exception.parse_error.113] parse error at byte 2: expected a CBOR string; last byte: 0xFF"); CHECK(json::from_cbor(std::vector({0xa1, 0xff, 0x01}), true, false).is_discarded()); } @@ -1509,7 +1509,7 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec), - "[json.exception.parse_error.110] parse error at 2: expected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: expected end of input"); CHECK(json::from_cbor(vec, true, false).is_discarded()); } } diff --git a/test/src/unit-class_parser.cpp b/test/src/unit-class_parser.cpp index b467acd9..1050f05b 100644 --- a/test/src/unit-class_parser.cpp +++ b/test/src/unit-class_parser.cpp @@ -313,18 +313,18 @@ TEST_CASE("parser class") // error: tab in string CHECK_THROWS_AS(parser_helper("\"\t\""), json::parse_error&); CHECK_THROWS_WITH(parser_helper("\"\t\""), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"'"); // error: newline in string CHECK_THROWS_AS(parser_helper("\"\n\""), json::parse_error&); CHECK_THROWS_AS(parser_helper("\"\r\""), json::parse_error&); CHECK_THROWS_WITH(parser_helper("\"\n\""), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"'"); CHECK_THROWS_WITH(parser_helper("\"\r\""), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"'"); // error: backspace in string CHECK_THROWS_AS(parser_helper("\"\b\""), json::parse_error&); CHECK_THROWS_WITH(parser_helper("\"\b\""), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"'"); // improve code coverage CHECK_THROWS_AS(parser_helper("\uFF01"), json::parse_error&); CHECK_THROWS_AS(parser_helper("[-4:1,]"), json::parse_error&); @@ -361,38 +361,38 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("\"\x1d\""), json::parse_error&); CHECK_THROWS_AS(parser_helper("\"\x1e\""), json::parse_error&); CHECK_THROWS_AS(parser_helper("\"\x1f\""), json::parse_error&); - CHECK_THROWS_WITH(parser_helper("\"\x00\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: missing closing quote; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x01\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x02\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x03\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x04\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x05\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x06\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x07\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x08\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x09\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0a\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0b\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0c\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0d\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0e\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0f\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x10\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x11\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x12\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x13\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x14\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x15\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x16\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x17\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x18\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x19\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1a\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1b\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1c\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1d\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1e\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1f\""), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x00\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: missing closing quote; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x01\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0001 (SOH) must be escaped to \\u0001; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x02\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0002 (STX) must be escaped to \\u0002; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x03\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0003 (ETX) must be escaped to \\u0003; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x04\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0004 (EOT) must be escaped to \\u0004; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x05\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0005 (ENQ) must be escaped to \\u0005; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x06\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0006 (ACK) must be escaped to \\u0006; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x07\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0007 (BEL) must be escaped to \\u0007; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x08\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x09\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0a\""), "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000B (VT) must be escaped to \\u000B; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000E (SO) must be escaped to \\u000E; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000F (SI) must be escaped to \\u000F; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x10\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0010 (DLE) must be escaped to \\u0010; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x11\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0011 (DC1) must be escaped to \\u0011; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x12\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0012 (DC2) must be escaped to \\u0012; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x13\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0013 (DC3) must be escaped to \\u0013; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x14\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0014 (DC4) must be escaped to \\u0014; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x15\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0015 (NAK) must be escaped to \\u0015; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x16\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0016 (SYN) must be escaped to \\u0016; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x17\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0017 (ETB) must be escaped to \\u0017; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x18\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0018 (CAN) must be escaped to \\u0018; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x19\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0019 (EM) must be escaped to \\u0019; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1a\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001A (SUB) must be escaped to \\u001A; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001B (ESC) must be escaped to \\u001B; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001C (FS) must be escaped to \\u001C; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001D (GS) must be escaped to \\u001D; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001E (RS) must be escaped to \\u001E; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001F (US) must be escaped to \\u001F; last read: '\"'"); SECTION("additional test for null byte") { @@ -403,7 +403,7 @@ TEST_CASE("parser class") std::string s = "\"1\""; s[1] = '\0'; CHECK_THROWS_AS(json::parse(s.begin(), s.end()), json::parse_error&); - CHECK_THROWS_WITH(json::parse(s.begin(), s.end()), "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: control character must be escaped; last read: '\"'"); + CHECK_THROWS_WITH(json::parse(s.begin(), s.end()), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0000 (NUL) must be escaped to \\u0000; last read: '\"'"); } } @@ -603,39 +603,39 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("+0"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("01"), - "[json.exception.parse_error.101] parse error at 2: syntax error - unexpected number literal; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - unexpected number literal; expected end of input"); CHECK_THROWS_WITH(parser_helper("-01"), - "[json.exception.parse_error.101] parse error at 3: syntax error - unexpected number literal; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - unexpected number literal; expected end of input"); CHECK_THROWS_WITH(parser_helper("--1"), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid number; expected digit after '-'; last read: '--'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '--'"); CHECK_THROWS_WITH(parser_helper("1."), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected digit after '.'; last read: '1.'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected digit after '.'; last read: '1.'"); CHECK_THROWS_WITH(parser_helper("1E"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E'"); CHECK_THROWS_WITH(parser_helper("1E-"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid number; expected digit after exponent sign; last read: '1E-'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid number; expected digit after exponent sign; last read: '1E-'"); CHECK_THROWS_WITH(parser_helper("1.E1"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected digit after '.'; last read: '1.E'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected digit after '.'; last read: '1.E'"); CHECK_THROWS_WITH(parser_helper("-1E"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '-1E'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '-1E'"); CHECK_THROWS_WITH(parser_helper("-0E#"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '-0E#'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '-0E#'"); CHECK_THROWS_WITH(parser_helper("-0E-#"), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid number; expected digit after exponent sign; last read: '-0E-#'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid number; expected digit after exponent sign; last read: '-0E-#'"); CHECK_THROWS_WITH(parser_helper("-0#"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid literal; last read: '-0#'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid literal; last read: '-0#'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0.0:"), - "[json.exception.parse_error.101] parse error at 5: syntax error - unexpected ':'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - unexpected ':'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0.0Z"), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid literal; last read: '-0.0Z'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid literal; last read: '-0.0Z'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0E123:"), - "[json.exception.parse_error.101] parse error at 7: syntax error - unexpected ':'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - unexpected ':'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0e0-:"), - "[json.exception.parse_error.101] parse error at 6: syntax error - invalid number; expected digit after '-'; last read: '-:'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error - invalid number; expected digit after '-'; last read: '-:'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0e-:"), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid number; expected digit after exponent sign; last read: '-0e-:'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid number; expected digit after exponent sign; last read: '-0e-:'"); CHECK_THROWS_WITH(parser_helper("-0f"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid literal; last read: '-0f'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: '-0f'; expected end of input"); } } } @@ -920,33 +920,33 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("1E/"), json::parse_error&); CHECK_THROWS_AS(parser_helper("1E:"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("0."), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected digit after '.'; last read: '0.'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected digit after '.'; last read: '0.'"); CHECK_THROWS_WITH(parser_helper("-"), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid number; expected digit after '-'; last read: '-'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '-'"); CHECK_THROWS_WITH(parser_helper("--"), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid number; expected digit after '-'; last read: '--'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '--'"); CHECK_THROWS_WITH(parser_helper("-0."), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid number; expected digit after '.'; last read: '-0.'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid number; expected digit after '.'; last read: '-0.'"); CHECK_THROWS_WITH(parser_helper("-."), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid number; expected digit after '-'; last read: '-.'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '-.'"); CHECK_THROWS_WITH(parser_helper("-:"), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid number; expected digit after '-'; last read: '-:'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '-:'"); CHECK_THROWS_WITH(parser_helper("0.:"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected digit after '.'; last read: '0.:'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected digit after '.'; last read: '0.:'"); CHECK_THROWS_WITH(parser_helper("e."), - "[json.exception.parse_error.101] parse error at 1: syntax error - invalid literal; last read: 'e'"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - invalid literal; last read: 'e'"); CHECK_THROWS_WITH(parser_helper("1e."), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e.'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e.'"); CHECK_THROWS_WITH(parser_helper("1e/"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e/'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e/'"); CHECK_THROWS_WITH(parser_helper("1e:"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e:'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e:'"); CHECK_THROWS_WITH(parser_helper("1E."), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E.'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E.'"); CHECK_THROWS_WITH(parser_helper("1E/"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E/'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E/'"); CHECK_THROWS_WITH(parser_helper("1E:"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E:'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E:'"); // unexpected end of null CHECK_THROWS_AS(parser_helper("n"), json::parse_error&); @@ -955,15 +955,15 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("nulk"), json::parse_error&); CHECK_THROWS_AS(parser_helper("nulm"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("n"), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid literal; last read: 'n'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid literal; last read: 'n'"); CHECK_THROWS_WITH(parser_helper("nu"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid literal; last read: 'nu'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid literal; last read: 'nu'"); CHECK_THROWS_WITH(parser_helper("nul"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid literal; last read: 'nul'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'nul'"); CHECK_THROWS_WITH(parser_helper("nulk"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid literal; last read: 'nulk'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'nulk'"); CHECK_THROWS_WITH(parser_helper("nulm"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid literal; last read: 'nulm'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'nulm'"); // unexpected end of true CHECK_THROWS_AS(parser_helper("t"), json::parse_error&); @@ -972,15 +972,15 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("trud"), json::parse_error&); CHECK_THROWS_AS(parser_helper("truf"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("t"), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid literal; last read: 't'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid literal; last read: 't'"); CHECK_THROWS_WITH(parser_helper("tr"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid literal; last read: 'tr'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid literal; last read: 'tr'"); CHECK_THROWS_WITH(parser_helper("tru"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid literal; last read: 'tru'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'tru'"); CHECK_THROWS_WITH(parser_helper("trud"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid literal; last read: 'trud'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'trud'"); CHECK_THROWS_WITH(parser_helper("truf"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid literal; last read: 'truf'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'truf'"); // unexpected end of false CHECK_THROWS_AS(parser_helper("f"), json::parse_error&); @@ -990,17 +990,17 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("falsd"), json::parse_error&); CHECK_THROWS_AS(parser_helper("falsf"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("f"), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid literal; last read: 'f'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid literal; last read: 'f'"); CHECK_THROWS_WITH(parser_helper("fa"), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid literal; last read: 'fa'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid literal; last read: 'fa'"); CHECK_THROWS_WITH(parser_helper("fal"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid literal; last read: 'fal'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'fal'"); CHECK_THROWS_WITH(parser_helper("fals"), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid literal; last read: 'fals'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid literal; last read: 'fals'"); CHECK_THROWS_WITH(parser_helper("falsd"), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid literal; last read: 'falsd'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid literal; last read: 'falsd'"); CHECK_THROWS_WITH(parser_helper("falsf"), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid literal; last read: 'falsf'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid literal; last read: 'falsf'"); // missing/unexpected end of array CHECK_THROWS_AS(parser_helper("["), json::parse_error&); @@ -1009,15 +1009,15 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("[1,]"), json::parse_error&); CHECK_THROWS_AS(parser_helper("]"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("["), - "[json.exception.parse_error.101] parse error at 2: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - unexpected end of input; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("[1"), - "[json.exception.parse_error.101] parse error at 3: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - unexpected end of input; expected ']'"); CHECK_THROWS_WITH(parser_helper("[1,"), - "[json.exception.parse_error.101] parse error at 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("[1,]"), - "[json.exception.parse_error.101] parse error at 4: syntax error - unexpected ']'; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - unexpected ']'; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("]"), - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected ']'; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected ']'; expected '[', '{', or a literal"); // missing/unexpected end of object CHECK_THROWS_AS(parser_helper("{"), json::parse_error&); @@ -1027,17 +1027,17 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("{\"foo\":1,}"), json::parse_error&); CHECK_THROWS_AS(parser_helper("}"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("{"), - "[json.exception.parse_error.101] parse error at 2: syntax error - unexpected end of input; expected string literal"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - unexpected end of input; expected string literal"); CHECK_THROWS_WITH(parser_helper("{\"foo\""), - "[json.exception.parse_error.101] parse error at 7: syntax error - unexpected end of input; expected ':'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - unexpected end of input; expected ':'"); CHECK_THROWS_WITH(parser_helper("{\"foo\":"), - "[json.exception.parse_error.101] parse error at 8: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error - unexpected end of input; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("{\"foo\":}"), - "[json.exception.parse_error.101] parse error at 8: syntax error - unexpected '}'; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error - unexpected '}'; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("{\"foo\":1,}"), - "[json.exception.parse_error.101] parse error at 10: syntax error - unexpected '}'; expected string literal"); + "[json.exception.parse_error.101] parse error at line 1, column 10: syntax error - unexpected '}'; expected string literal"); CHECK_THROWS_WITH(parser_helper("}"), - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected '}'; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected '}'; expected '[', '{', or a literal"); // missing/unexpected end of string CHECK_THROWS_AS(parser_helper("\""), json::parse_error&); @@ -1051,25 +1051,25 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("\"\\u01"), json::parse_error&); CHECK_THROWS_AS(parser_helper("\"\\u012"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("\""), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid string: missing closing quote; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: missing closing quote; last read: '\"'"); CHECK_THROWS_WITH(parser_helper("\"\\\""), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: missing closing quote; last read: '\"\\\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: missing closing quote; last read: '\"\\\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u\""), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u0\""), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u01\""), - "[json.exception.parse_error.101] parse error at 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u012\""), - "[json.exception.parse_error.101] parse error at 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u"), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u'"); CHECK_THROWS_WITH(parser_helper("\"\\u0"), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0'"); CHECK_THROWS_WITH(parser_helper("\"\\u01"), - "[json.exception.parse_error.101] parse error at 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01'"); + "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01'"); CHECK_THROWS_WITH(parser_helper("\"\\u012"), - "[json.exception.parse_error.101] parse error at 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012'"); // invalid escapes for (int c = 1; c < 128; ++c) @@ -1106,7 +1106,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s.c_str()), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid string: forbidden character after backslash; last read: '\"\\" + std::string(1, static_cast(c)) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid string: forbidden character after backslash; last read: '\"\\" + std::string(1, static_cast(c)) + "'"); } break; } @@ -1182,7 +1182,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s1.c_str()), - "[json.exception.parse_error.101] parse error at 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s1.substr(0, 7) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s1.substr(0, 7) + "'"); } CAPTURE(s2); @@ -1191,7 +1191,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s2.c_str()), - "[json.exception.parse_error.101] parse error at 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s2.substr(0, 6) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s2.substr(0, 6) + "'"); } CAPTURE(s3); @@ -1200,7 +1200,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s3.c_str()), - "[json.exception.parse_error.101] parse error at 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s3.substr(0, 5) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s3.substr(0, 5) + "'"); } CAPTURE(s4); @@ -1209,7 +1209,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s4.c_str()), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s4.substr(0, 4) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s4.substr(0, 4) + "'"); } } } @@ -1218,17 +1218,17 @@ TEST_CASE("parser class") // missing part of a surrogate pair CHECK_THROWS_AS(json::parse("\"\\uD80C\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD80C\""), - "[json.exception.parse_error.101] parse error at 8: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\"'"); // invalid surrogate pair CHECK_THROWS_AS(json::parse("\"\\uD80C\\uD80C\""), json::parse_error&); CHECK_THROWS_AS(json::parse("\"\\uD80C\\u0000\""), json::parse_error&); CHECK_THROWS_AS(json::parse("\"\\uD80C\\uFFFF\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD80C\\uD80C\""), - "[json.exception.parse_error.101] parse error at 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uD80C'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uD80C'"); CHECK_THROWS_WITH(json::parse("\"\\uD80C\\u0000\""), - "[json.exception.parse_error.101] parse error at 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\u0000'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\u0000'"); CHECK_THROWS_WITH(json::parse("\"\\uD80C\\uFFFF\""), - "[json.exception.parse_error.101] parse error at 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uFFFF'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uFFFF'"); } SECTION("parse errors (accept)") @@ -1419,11 +1419,11 @@ TEST_CASE("parser class") // test case to make sure no comma preceeds the first key CHECK_THROWS_AS(parser_helper("{,\"key\": false}"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("{,\"key\": false}"), - "[json.exception.parse_error.101] parse error at 2: syntax error - unexpected ','; expected string literal"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - unexpected ','; expected string literal"); // test case to make sure an object is properly closed CHECK_THROWS_AS(parser_helper("[{\"key\": false true]"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("[{\"key\": false true]"), - "[json.exception.parse_error.101] parse error at 19: syntax error - unexpected true literal; expected '}'"); + "[json.exception.parse_error.101] parse error at line 1, column 19: syntax error - unexpected true literal; expected '}'"); // test case to make sure the callback is properly evaluated after reading a key { @@ -1674,7 +1674,7 @@ TEST_CASE("parser class") CHECK_THROWS_AS(json::parse("{\"foo\": true:", cb), json::parse_error&); CHECK_THROWS_WITH(json::parse("{\"foo\": true:", cb), - "[json.exception.parse_error.101] parse error at 13: syntax error - unexpected ':'; expected '}'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - unexpected ':'; expected '}'"); CHECK_THROWS_AS(json::parse("1.18973e+4932", cb), json::out_of_range&); CHECK_THROWS_WITH(json::parse("1.18973e+4932", cb), diff --git a/test/src/unit-deserialization.cpp b/test/src/unit-deserialization.cpp index f6c75d11..7806d5d4 100644 --- a/test/src/unit-deserialization.cpp +++ b/test/src/unit-deserialization.cpp @@ -267,7 +267,7 @@ TEST_CASE("deserialization") ss5 << "[\"foo\",1,2,3,false,{\"one\":1}"; CHECK_THROWS_AS(json::parse(ss1), json::parse_error&); CHECK_THROWS_WITH(json::parse(ss2), - "[json.exception.parse_error.101] parse error at 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); CHECK(not json::accept(ss3)); json j_error; @@ -291,7 +291,7 @@ TEST_CASE("deserialization") json::string_t s = "[\"foo\",1,2,3,false,{\"one\":1}"; CHECK_THROWS_AS(json::parse(s), json::parse_error&); CHECK_THROWS_WITH(json::parse(s), - "[json.exception.parse_error.101] parse error at 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); CHECK(not json::accept(s)); json j_error; @@ -318,7 +318,7 @@ TEST_CASE("deserialization") json j; CHECK_THROWS_AS(j << ss1, json::parse_error&); CHECK_THROWS_WITH(j << ss2, - "[json.exception.parse_error.101] parse error at 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); } SECTION("operator>>") @@ -329,14 +329,14 @@ TEST_CASE("deserialization") json j; CHECK_THROWS_AS(ss1 >> j, json::parse_error&); CHECK_THROWS_WITH(ss2 >> j, - "[json.exception.parse_error.101] parse error at 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); } SECTION("user-defined string literal") { CHECK_THROWS_AS("[\"foo\",1,2,3,false,{\"one\":1}"_json, json::parse_error&); CHECK_THROWS_WITH("[\"foo\",1,2,3,false,{\"one\":1}"_json, - "[json.exception.parse_error.101] parse error at 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); } } @@ -612,7 +612,7 @@ TEST_CASE("deserialization") uint8_t v[] = {'\"', 0x7F, 0xDF, 0x7F}; CHECK_THROWS_AS(json::parse(std::begin(v), std::end(v)), json::parse_error&); CHECK_THROWS_WITH(json::parse(std::begin(v), std::end(v)), - "[json.exception.parse_error.101] parse error at 4: syntax error - invalid string: ill-formed UTF-8 byte; last read: '\"\x7f\xdf\x7f'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: ill-formed UTF-8 byte; last read: '\"\x7f\xdf\x7f'"); CHECK(not json::accept(std::begin(v), std::end(v))); json j_error; @@ -799,11 +799,11 @@ TEST_CASE("deserialization") { CHECK_THROWS_AS(json::parse(bom), json::parse_error&); CHECK_THROWS_WITH(json::parse(bom), - "[json.exception.parse_error.101] parse error at 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); CHECK_THROWS_AS(json::parse(std::istringstream(bom)), json::parse_error&); CHECK_THROWS_WITH(json::parse(std::istringstream(bom)), - "[json.exception.parse_error.101] parse error at 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); SaxEventLogger l; CHECK(not json::sax_parse(bom, &l)); @@ -838,11 +838,11 @@ TEST_CASE("deserialization") { CHECK_THROWS_AS(json::parse(bom.substr(0, 2)), json::parse_error&); CHECK_THROWS_WITH(json::parse(bom.substr(0, 2)), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'"); CHECK_THROWS_AS(json::parse(std::istringstream(bom.substr(0, 2))), json::parse_error&); CHECK_THROWS_WITH(json::parse(std::istringstream(bom.substr(0, 2))), - "[json.exception.parse_error.101] parse error at 3: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'"); SaxEventLogger l1, l2; CHECK(not json::sax_parse(std::istringstream(bom.substr(0, 2)), &l1)); @@ -863,11 +863,11 @@ TEST_CASE("deserialization") { CHECK_THROWS_AS(json::parse(bom.substr(0, 1)), json::parse_error&); CHECK_THROWS_WITH(json::parse(bom.substr(0, 1)), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'"); CHECK_THROWS_AS(json::parse(std::istringstream(bom.substr(0, 1))), json::parse_error&); CHECK_THROWS_WITH(json::parse(std::istringstream(bom.substr(0, 1))), - "[json.exception.parse_error.101] parse error at 2: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'"); SaxEventLogger l1, l2; CHECK(not json::sax_parse(std::istringstream(bom.substr(0, 1)), &l1)); diff --git a/test/src/unit-json_pointer.cpp b/test/src/unit-json_pointer.cpp index d02bd939..7f5605d9 100644 --- a/test/src/unit-json_pointer.cpp +++ b/test/src/unit-json_pointer.cpp @@ -39,7 +39,7 @@ TEST_CASE("JSON pointers") { CHECK_THROWS_AS(json::json_pointer("foo"), json::parse_error&); CHECK_THROWS_WITH(json::json_pointer("foo"), - "[json.exception.parse_error.107] parse error at 1: JSON pointer must be empty or begin with '/' - was: 'foo'"); + "[json.exception.parse_error.107] parse error at byte 1: JSON pointer must be empty or begin with '/' - was: 'foo'"); CHECK_THROWS_AS(json::json_pointer("/~~"), json::parse_error&); CHECK_THROWS_WITH(json::json_pointer("/~~"), diff --git a/test/src/unit-msgpack.cpp b/test/src/unit-msgpack.cpp index 0848ef08..f75cedce 100644 --- a/test/src/unit-msgpack.cpp +++ b/test/src/unit-msgpack.cpp @@ -1124,7 +1124,7 @@ TEST_CASE("MessagePack") { CHECK_THROWS_AS(json::from_msgpack(std::vector()), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector()), - "[json.exception.parse_error.110] parse error at 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); CHECK(json::from_msgpack(std::vector(), true, false).is_discarded()); } @@ -1151,43 +1151,43 @@ TEST_CASE("MessagePack") CHECK_THROWS_AS(json::from_msgpack(std::vector({0x81, 0xa1, 0x61})), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0x87})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcc})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcd})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcd, 0x00})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xce})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xce, 0x00})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xce, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xce, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf})), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 6: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 6: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 7: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 7: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 8: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at 9: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 9: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xa5, 0x68, 0x65})), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0x92, 0x01})), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0x81, 0xa1, 0x61})), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_msgpack(std::vector({0x87}), true, false).is_discarded()); CHECK(json::from_msgpack(std::vector({0xcc}), true, false).is_discarded()); @@ -1216,12 +1216,12 @@ TEST_CASE("MessagePack") { CHECK_THROWS_AS(json::from_msgpack(std::vector({0xc1})), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xc1})), - "[json.exception.parse_error.112] parse error at 1: error reading MessagePack; last byte: 0xC1"); + "[json.exception.parse_error.112] parse error at byte 1: error reading MessagePack; last byte: 0xC1"); CHECK(json::from_msgpack(std::vector({0xc6}), true, false).is_discarded()); CHECK_THROWS_AS(json::from_msgpack(std::vector({0xc6})), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xc6})), - "[json.exception.parse_error.112] parse error at 1: error reading MessagePack; last byte: 0xC6"); + "[json.exception.parse_error.112] parse error at byte 1: error reading MessagePack; last byte: 0xC6"); CHECK(json::from_msgpack(std::vector({0xc6}), true, false).is_discarded()); } @@ -1249,7 +1249,7 @@ TEST_CASE("MessagePack") { CHECK_THROWS_AS(json::from_msgpack(std::vector({0x81, 0xff, 0x01})), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0x81, 0xff, 0x01})), - "[json.exception.parse_error.113] parse error at 2: expected a MessagePack string; last byte: 0xFF"); + "[json.exception.parse_error.113] parse error at byte 2: expected a MessagePack string; last byte: 0xFF"); CHECK(json::from_msgpack(std::vector({0x81, 0xff, 0x01}), true, false).is_discarded()); } @@ -1266,7 +1266,7 @@ TEST_CASE("MessagePack") { CHECK_THROWS_AS(json::from_msgpack(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec), - "[json.exception.parse_error.110] parse error at 2: expected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: expected end of input"); CHECK(json::from_msgpack(vec, true, false).is_discarded()); } } diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index 6b9fd957..475104ce 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -725,7 +725,7 @@ TEST_CASE("regression tests") { std::ifstream f("file_not_found.json"); CHECK_THROWS_AS(json::parse(f), json::parse_error&); - CHECK_THROWS_WITH(json::parse(f), "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + CHECK_THROWS_WITH(json::parse(f), "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("issue #367 - calling stream at EOF") @@ -741,7 +741,7 @@ TEST_CASE("regression tests") // a parse error because of the EOF. CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("issue #367 - behavior of operator>> should more closely resemble that of built-in overloads") @@ -752,7 +752,7 @@ TEST_CASE("regression tests") json j; CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("(whitespace)") @@ -762,7 +762,7 @@ TEST_CASE("regression tests") json j; CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("one value") @@ -775,7 +775,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("one value + whitespace") @@ -788,7 +788,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("whitespace + one value") @@ -801,7 +801,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("three values") @@ -818,7 +818,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("literals without whitespace") @@ -837,7 +837,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("example from #529") @@ -852,7 +852,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); } SECTION("second example from #529") @@ -922,7 +922,7 @@ TEST_CASE("regression tests") std::vector vec {0x65, 0xf5, 0x0a, 0x48, 0x21}; CHECK_THROWS_AS(json::from_cbor(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec), - "[json.exception.parse_error.110] parse error at 6: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 6: unexpected end of input"); } SECTION("issue #407 - Heap-buffer-overflow (OSS-Fuzz issue 343)") @@ -931,31 +931,31 @@ TEST_CASE("regression tests") std::vector vec1 {0xcb, 0x8f, 0x0a}; CHECK_THROWS_AS(json::from_msgpack(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec1), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); // related test case: incomplete float32 std::vector vec2 {0xca, 0x8f, 0x0a}; CHECK_THROWS_AS(json::from_msgpack(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec2), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); // related test case: incomplete Half-Precision Float (CBOR) std::vector vec3 {0xf9, 0x8f}; CHECK_THROWS_AS(json::from_cbor(vec3), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec3), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); // related test case: incomplete Single-Precision Float (CBOR) std::vector vec4 {0xfa, 0x8f, 0x0a}; CHECK_THROWS_AS(json::from_cbor(vec4), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec4), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); // related test case: incomplete Double-Precision Float (CBOR) std::vector vec5 {0xfb, 0x8f, 0x0a}; CHECK_THROWS_AS(json::from_cbor(vec5), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec5), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); } SECTION("issue #408 - Heap-buffer-overflow (OSS-Fuzz issue 344)") @@ -964,7 +964,7 @@ TEST_CASE("regression tests") std::vector vec1 {0x87}; CHECK_THROWS_AS(json::from_msgpack(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec1), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); // more test cases for MessagePack for (auto b : @@ -998,10 +998,10 @@ TEST_CASE("regression tests") std::vector vec2; CHECK_THROWS_AS(json::from_cbor(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec2), - "[json.exception.parse_error.110] parse error at 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); CHECK_THROWS_AS(json::from_msgpack(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec2), - "[json.exception.parse_error.110] parse error at 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); } SECTION("issue #411 - Heap-buffer-overflow (OSS-Fuzz issue 366)") @@ -1010,19 +1010,19 @@ TEST_CASE("regression tests") std::vector vec1 {0x7f}; CHECK_THROWS_AS(json::from_cbor(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec1), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); // related test case: empty array (indefinite length) std::vector vec2 {0x9f}; CHECK_THROWS_AS(json::from_cbor(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec2), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); // related test case: empty map (indefinite length) std::vector vec3 {0xbf}; CHECK_THROWS_AS(json::from_cbor(vec3), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec3), - "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); } SECTION("issue #412 - Heap-buffer-overflow (OSS-Fuzz issue 367)") @@ -1050,25 +1050,25 @@ TEST_CASE("regression tests") }; CHECK_THROWS_AS(json::from_cbor(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec), - "[json.exception.parse_error.113] parse error at 2: expected a CBOR string; last byte: 0x98"); + "[json.exception.parse_error.113] parse error at byte 2: expected a CBOR string; last byte: 0x98"); // related test case: nonempty UTF-8 string (indefinite length) std::vector vec1 {0x7f, 0x61, 0x61}; CHECK_THROWS_AS(json::from_cbor(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec1), - "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); // related test case: nonempty array (indefinite length) std::vector vec2 {0x9f, 0x01}; CHECK_THROWS_AS(json::from_cbor(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec2), - "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); // related test case: nonempty map (indefinite length) std::vector vec3 {0xbf, 0x61, 0x61, 0x01}; CHECK_THROWS_AS(json::from_cbor(vec3), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec3), - "[json.exception.parse_error.110] parse error at 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); } SECTION("issue #414 - compare with literal 0)") @@ -1103,7 +1103,7 @@ TEST_CASE("regression tests") }; CHECK_THROWS_AS(json::from_cbor(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec1), - "[json.exception.parse_error.113] parse error at 13: expected a CBOR string; last byte: 0xB4"); + "[json.exception.parse_error.113] parse error at byte 13: expected a CBOR string; last byte: 0xB4"); // related test case: double-precision std::vector vec2 @@ -1117,7 +1117,7 @@ TEST_CASE("regression tests") }; CHECK_THROWS_AS(json::from_cbor(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec2), - "[json.exception.parse_error.113] parse error at 13: expected a CBOR string; last byte: 0xB4"); + "[json.exception.parse_error.113] parse error at byte 13: expected a CBOR string; last byte: 0xB4"); } SECTION("issue #452 - Heap-buffer-overflow (OSS-Fuzz issue 585)") diff --git a/test/src/unit-ubjson.cpp b/test/src/unit-ubjson.cpp index 3b060c97..d2410ff6 100644 --- a/test/src/unit-ubjson.cpp +++ b/test/src/unit-ubjson.cpp @@ -1299,7 +1299,7 @@ TEST_CASE("UBJSON") { CHECK_THROWS_AS(json::from_ubjson(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_ubjson(vec), - "[json.exception.parse_error.110] parse error at 2: expected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: expected end of input"); } } @@ -1529,7 +1529,7 @@ TEST_CASE("UBJSON") { CHECK_THROWS_AS(json::from_ubjson(std::vector()), json::parse_error&); CHECK_THROWS_WITH(json::from_ubjson(std::vector()), - "[json.exception.parse_error.110] parse error at 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); } SECTION("char") @@ -1538,14 +1538,14 @@ TEST_CASE("UBJSON") { std::vector v = {'C'}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); } SECTION("byte out of range") { std::vector v = {'C', 130}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.113] parse error at 2: byte after 'C' must be in range 0x00..0x7F; last byte: 0x82"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: byte after 'C' must be in range 0x00..0x7F; last byte: 0x82"); } } @@ -1555,14 +1555,14 @@ TEST_CASE("UBJSON") { std::vector v = {'S'}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); } SECTION("invalid byte") { std::vector v = {'S', '1', 'a'}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.113] parse error at 2: expected a UBJSON string; last byte: 0x31"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: expected a UBJSON string; last byte: 0x31"); } } @@ -1572,7 +1572,7 @@ TEST_CASE("UBJSON") { std::vector v = {'[', '$', 'i', 2}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.112] parse error at 4: expected '#' after UBJSON type information; last byte: 0x02"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.112] parse error at byte 4: expected '#' after UBJSON type information; last byte: 0x02"); } } @@ -1580,17 +1580,17 @@ TEST_CASE("UBJSON") { std::vector vS = {'S'}; CHECK_THROWS_AS(json::from_ubjson(vS), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK(json::from_ubjson(vS, true, false).is_discarded()); std::vector v = {'S', 'i', '2', 'a'}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at 5: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); CHECK(json::from_ubjson(v, true, false).is_discarded()); std::vector vC = {'C'}; CHECK_THROWS_AS(json::from_ubjson(vC), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vC), "[json.exception.parse_error.110] parse error at 2: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vC), "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); CHECK(json::from_ubjson(vC, true, false).is_discarded()); } @@ -1598,32 +1598,32 @@ TEST_CASE("UBJSON") { std::vector vU = {'[', '#', 'U'}; CHECK_THROWS_AS(json::from_ubjson(vU), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vU), "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vU), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_ubjson(vU, true, false).is_discarded()); std::vector vi = {'[', '#', 'i'}; CHECK_THROWS_AS(json::from_ubjson(vi), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_ubjson(vi, true, false).is_discarded()); std::vector vI = {'[', '#', 'I'}; CHECK_THROWS_AS(json::from_ubjson(vI), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vI), "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vI), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_ubjson(vI, true, false).is_discarded()); std::vector vl = {'[', '#', 'l'}; CHECK_THROWS_AS(json::from_ubjson(vl), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vl), "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vl), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_ubjson(vl, true, false).is_discarded()); std::vector vL = {'[', '#', 'L'}; CHECK_THROWS_AS(json::from_ubjson(vL), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vL), "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vL), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_ubjson(vL, true, false).is_discarded()); std::vector v0 = {'[', '#', 'T', ']'}; CHECK_THROWS_AS(json::from_ubjson(v0), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v0), "[json.exception.parse_error.113] parse error at 3: byte after '#' must denote a number type; last byte: 0x54"); + CHECK_THROWS_WITH(json::from_ubjson(v0), "[json.exception.parse_error.113] parse error at byte 3: byte after '#' must denote a number type; last byte: 0x54"); CHECK(json::from_ubjson(v0, true, false).is_discarded()); } @@ -1631,17 +1631,17 @@ TEST_CASE("UBJSON") { std::vector v0 = {'[', '$'}; CHECK_THROWS_AS(json::from_ubjson(v0), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v0), "[json.exception.parse_error.110] parse error at 3: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v0), "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); CHECK(json::from_ubjson(v0, true, false).is_discarded()); std::vector vi = {'[', '$', '#'}; CHECK_THROWS_AS(json::from_ubjson(vi), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_ubjson(vi, true, false).is_discarded()); std::vector vT = {'[', '$', 'T'}; CHECK_THROWS_AS(json::from_ubjson(vT), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vT), "[json.exception.parse_error.110] parse error at 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vT), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); CHECK(json::from_ubjson(vT, true, false).is_discarded()); } @@ -1649,17 +1649,17 @@ TEST_CASE("UBJSON") { std::vector vST = {'[', '$', 'i', '#', 'i', 2, 1}; CHECK_THROWS_AS(json::from_ubjson(vST), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at 8: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); CHECK(json::from_ubjson(vST, true, false).is_discarded()); std::vector vS = {'[', '#', 'i', 2, 'i', 1}; CHECK_THROWS_AS(json::from_ubjson(vS), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at 7: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 7: unexpected end of input"); CHECK(json::from_ubjson(vS, true, false).is_discarded()); std::vector v = {'[', 'i', 2, 'i', 1}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at 6: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 6: unexpected end of input"); CHECK(json::from_ubjson(v, true, false).is_discarded()); } @@ -1667,42 +1667,42 @@ TEST_CASE("UBJSON") { std::vector vST = {'{', '$', 'i', '#', 'i', 2, 'i', 1, 'a', 1}; CHECK_THROWS_AS(json::from_ubjson(vST), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at 11: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 11: unexpected end of input"); CHECK(json::from_ubjson(vST, true, false).is_discarded()); std::vector vT = {'{', '$', 'i', 'i', 1, 'a', 1}; CHECK_THROWS_AS(json::from_ubjson(vT), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vT), "[json.exception.parse_error.112] parse error at 4: expected '#' after UBJSON type information; last byte: 0x69"); + CHECK_THROWS_WITH(json::from_ubjson(vT), "[json.exception.parse_error.112] parse error at byte 4: expected '#' after UBJSON type information; last byte: 0x69"); CHECK(json::from_ubjson(vT, true, false).is_discarded()); std::vector vS = {'{', '#', 'i', 2, 'i', 1, 'a', 'i', 1}; CHECK_THROWS_AS(json::from_ubjson(vS), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at 10: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 10: unexpected end of input"); CHECK(json::from_ubjson(vS, true, false).is_discarded()); std::vector v = {'{', 'i', 1, 'a', 'i', 1}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at 7: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 7: unexpected end of input"); CHECK(json::from_ubjson(v, true, false).is_discarded()); std::vector v2 = {'{', 'i', 1, 'a', 'i', 1, 'i'}; CHECK_THROWS_AS(json::from_ubjson(v2), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v2), "[json.exception.parse_error.110] parse error at 8: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v2), "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); CHECK(json::from_ubjson(v2, true, false).is_discarded()); std::vector v3 = {'{', 'i', 1, 'a'}; CHECK_THROWS_AS(json::from_ubjson(v3), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v3), "[json.exception.parse_error.110] parse error at 5: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v3), "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); CHECK(json::from_ubjson(v3, true, false).is_discarded()); std::vector vST1 = {'{', '$', 'd', '#', 'i', 2, 'i', 1, 'a'}; CHECK_THROWS_AS(json::from_ubjson(vST1), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vST1), "[json.exception.parse_error.110] parse error at 10: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vST1), "[json.exception.parse_error.110] parse error at byte 10: unexpected end of input"); CHECK(json::from_ubjson(vST1, true, false).is_discarded()); std::vector vST2 = {'{', '#', 'i', 2, 'i', 1, 'a'}; CHECK_THROWS_AS(json::from_ubjson(vST2), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vST2), "[json.exception.parse_error.110] parse error at 8: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vST2), "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); CHECK(json::from_ubjson(vST2, true, false).is_discarded()); } } diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index ae580e3e..3ce446f7 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -931,31 +931,31 @@ TEST_CASE("Unicode", "[hide]") { CHECK_THROWS_AS(json::parse("\"\\uDC00\\uDC00\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uDC00\\uDC00\""), - "[json.exception.parse_error.101] parse error at 7: syntax error - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uDC00'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uDC00'"); CHECK_THROWS_AS(json::parse("\"\\uD7FF\\uDC00\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD7FF\\uDC00\""), - "[json.exception.parse_error.101] parse error at 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uD7FF\\uDC00'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uD7FF\\uDC00'"); CHECK_THROWS_AS(json::parse("\"\\uD800]\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800]\""), - "[json.exception.parse_error.101] parse error at 8: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800]'"); + "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800]'"); CHECK_THROWS_AS(json::parse("\"\\uD800\\v\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800\\v\""), - "[json.exception.parse_error.101] parse error at 9: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\v'"); + "[json.exception.parse_error.101] parse error at line 1, column 9: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\v'"); CHECK_THROWS_AS(json::parse("\"\\uD800\\u123\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800\\u123\""), - "[json.exception.parse_error.101] parse error at 13: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\uD800\\u123\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\uD800\\u123\"'"); CHECK_THROWS_AS(json::parse("\"\\uD800\\uDBFF\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800\\uDBFF\""), - "[json.exception.parse_error.101] parse error at 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uDBFF'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uDBFF'"); CHECK_THROWS_AS(json::parse("\"\\uD800\\uE000\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800\\uE000\""), - "[json.exception.parse_error.101] parse error at 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uE000'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uE000'"); } } From 6d09cdec3466a5c9c1b5a87803390de5aa47c3b7 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 7 Oct 2018 16:48:45 +0200 Subject: [PATCH 24/77] :bug: fixed a bug in the unget function --- include/nlohmann/detail/exceptions.hpp | 5 ----- include/nlohmann/detail/input/lexer.hpp | 12 +++++++++--- single_include/nlohmann/json.hpp | 17 +++++++++-------- test/src/unit-class_parser.cpp | 3 +++ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index a26e30f3..9f5961e6 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -154,11 +154,6 @@ class parse_error : public exception static std::string position_string(const position_t& pos) { - if (pos.chars_read_total == 0) - { - return ""; - } - return " at line " + std::to_string(pos.lines_read + 1) + ", column " + std::to_string(pos.chars_read_current_line); } diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 815cac81..05eb112e 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -1278,12 +1278,18 @@ scan_number_done: next_unget = true; --position.chars_read_total; - --position.chars_read_current_line; // in case we "unget" a newline, we have to also decrement the lines_read - if (position.lines_read != 0 and position.chars_read_current_line == 0) + if (position.chars_read_current_line == 0) { - --position.lines_read; + if (position.lines_read > 0) + { + --position.lines_read; + } + } + else + { + --position.chars_read_current_line; } if (JSON_LIKELY(current != std::char_traits::eof())) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 957cfc24..e551784a 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -795,11 +795,6 @@ class parse_error : public exception static std::string position_string(const position_t& pos) { - if (pos.chars_read_total == 0) - { - return ""; - } - return " at line " + std::to_string(pos.lines_read + 1) + ", column " + std::to_string(pos.chars_read_current_line); } @@ -3595,12 +3590,18 @@ scan_number_done: next_unget = true; --position.chars_read_total; - --position.chars_read_current_line; // in case we "unget" a newline, we have to also decrement the lines_read - if (position.lines_read != 0 and position.chars_read_current_line == 0) + if (position.chars_read_current_line == 0) { - --position.lines_read; + if (position.lines_read > 0) + { + --position.lines_read; + } + } + else + { + --position.chars_read_current_line; } if (JSON_LIKELY(current != std::char_traits::eof())) diff --git a/test/src/unit-class_parser.cpp b/test/src/unit-class_parser.cpp index 1050f05b..8dac4a44 100644 --- a/test/src/unit-class_parser.cpp +++ b/test/src/unit-class_parser.cpp @@ -1292,6 +1292,9 @@ TEST_CASE("parser class") CHECK(accept_helper("\"\\u01") == false); CHECK(accept_helper("\"\\u012") == false); + // unget of newline + CHECK(parser_helper("\n123\n") == 123); + // invalid escapes for (int c = 1; c < 128; ++c) { From 062aeaf7b654f1573c57929d229861845031185b Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sun, 7 Oct 2018 17:57:13 +0200 Subject: [PATCH 25/77] BSON: Reworked the `binary_writer` such that it precomputes the size of the BSON-output. This way, the output_adapter can work on simple output iterators and no longer requires random access iterators. --- .../nlohmann/detail/output/binary_writer.hpp | 345 ++++++++------ .../detail/output/output_adapters.hpp | 43 -- include/nlohmann/json.hpp | 43 +- single_include/nlohmann/json.hpp | 431 ++++++++++-------- test/src/unit-alt-string.cpp | 10 - 5 files changed, 488 insertions(+), 384 deletions(-) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 363bb9b2..bce5116d 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -9,6 +9,7 @@ #include #include + namespace nlohmann { namespace detail @@ -676,187 +677,278 @@ class binary_writer } } - std::size_t write_bson_boolean(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @return The size of a BSON document entry header, including the id marker and the entry name size (and its null-terminator). + */ + static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { - oa->write_character(static_cast(0x08)); // boolean + return /*id*/ 1ul + name.size() + /*zero-terminator*/1u; + } + + /*! + @brief Writes the given @a element_type and @a name to the output adapter + */ + void write_bson_entry_header(const typename BasicJsonType::string_t& name, std::uint8_t element_type) + { + oa->write_character(static_cast(element_type)); // boolean oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); - oa->write_character(j.m_value.boolean ? static_cast(0x01) : static_cast(0x00)); - return /*id*/ 1ul + name.size() + 1u + /*boolean value*/ 1u; } - std::size_t write_bson_double(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and boolean value @a value + */ + void write_bson_boolean(const typename BasicJsonType::string_t& name, const bool value) { - oa->write_character(static_cast(0x01)); // double - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - write_number(j.m_value.number_float); - return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u; + write_bson_entry_header(name, 0x08); + oa->write_character(value ? static_cast(0x01) : static_cast(0x00)); } - std::size_t write_bson_string(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and double value @a value + */ + void write_bson_double(const typename BasicJsonType::string_t& name, const double value) { - oa->write_character(static_cast(0x02)); // string (UTF-8) - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(j.m_value.string->size() + 1ul)); - oa->write_characters( - reinterpret_cast(j.m_value.string->c_str()), - j.m_value.string->size() + 1); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t) + j.m_value.string->size() + 1ul; + write_bson_entry_header(name, 0x01); + write_number(value); } - std::size_t write_bson_null(const typename BasicJsonType::string_t& name, const BasicJsonType&) + /*! + @return The size of the BSON-encoded string in @a value + */ + static std::size_t calc_bson_string_size(const typename BasicJsonType::string_t& value) { - oa->write_character(static_cast(0x0A)); // null - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - return /*id*/ 1ul + name.size() + 1ul; + return sizeof(std::int32_t) + value.size() + 1ul; } - std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and string value @a value + */ + void write_bson_string(const typename BasicJsonType::string_t& name, const typename BasicJsonType::string_t& value) { - auto n = j.m_value.number_integer; - if ((std::numeric_limits::min)() <= n and n <= (std::numeric_limits::max)()) + write_bson_entry_header(name, 0x02); + + write_number(static_cast(value.size() + 1ul)); + oa->write_characters( + reinterpret_cast(value.c_str()), + value.size() + 1); + } + + /*! + @brief Writes a BSON element with key @a name and null value + */ + void write_bson_null(const typename BasicJsonType::string_t& name) + { + write_bson_entry_header(name, 0x0A); + } + + /*! + @return The size of the BSON-encoded integer @a value + */ + static std::size_t calc_bson_integer_size(const std::int64_t value) + { + if ((std::numeric_limits::min)() <= value and value <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x10)); // int32 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(n)); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + return sizeof(std::int32_t); } else { - oa->write_character(static_cast(0x12)); // int64 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(j.m_value.number_integer)); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); + return sizeof(std::int64_t); } } - std::size_t write_bson_unsigned(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and integer @a value + */ + void write_bson_integer(const typename BasicJsonType::string_t& name, const std::int64_t value) { - auto n = j.m_value.number_integer; - if (n <= static_cast((std::numeric_limits::max)())) + if ((std::numeric_limits::min)() <= value and value <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x10)); // int32 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(n)); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + write_bson_entry_header(name, 0x10); // int32 + write_number(static_cast(value)); } else { - oa->write_character(static_cast(0x12)); // int64 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(j.m_value.number_integer)); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); + write_bson_entry_header(name, 0x12); // int64 + write_number(static_cast(value)); } } - std::size_t write_bson_object_internal(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + + /*! + @return The size of the BSON-encoded unsigned integer in @a j + */ + static std::size_t calc_bson_unsigned_size(const std::uint64_t value) { - oa->write_character(static_cast(0x03)); // object - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - auto const embedded_document_size = write_bson_object(j); - - return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; + if (value <= static_cast((std::numeric_limits::max)())) + { + return sizeof(std::int32_t); + } + else + { + return sizeof(std::int64_t); + } } - std::size_t write_bson_array(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and unsigned @a value + */ + void write_bson_unsigned(const typename BasicJsonType::string_t& name, const std::uint64_t value) { - oa->write_character(static_cast(0x04)); // object - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - - auto document_size_offset = oa->reserve_characters(4ul); - std::int32_t embedded_document_size = 5ul; - - for (const auto& el : *j.m_value.array) + if (value <= static_cast((std::numeric_limits::max)())) { - embedded_document_size += write_bson_object_entry("", el); + write_bson_entry_header(name, 0x10); // int32 + write_number(static_cast(value)); + } + else + { + write_bson_entry_header(name, 0x12); // int64 + write_number(static_cast(value)); + } + } + + /*! + @brief Writes a BSON element with key @a name and object @a value + */ + void write_bson_object_entry(const typename BasicJsonType::string_t& name, const typename BasicJsonType::object_t& value) + { + write_bson_entry_header(name, 0x03); // object + write_bson_object(value); + } + + + /*! + @return The size of the BSON-encoded array @a value + */ + static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value) + { + std::size_t embedded_document_size = 0ul; + + for (const auto& el : value) + { + embedded_document_size += calc_bson_element_size("", el); + } + + return sizeof(std::int32_t) + embedded_document_size + 1ul; + } + + /*! + @brief Writes a BSON element with key @a name and array @a value + */ + void write_bson_array(const typename BasicJsonType::string_t& name, const typename BasicJsonType::array_t& value) + { + write_bson_entry_header(name, 0x04); // array + write_number(calc_bson_array_size(value)); + + for (const auto& el : value) + { + write_bson_element("", el); } oa->write_character(static_cast(0x00)); - write_number_at(document_size_offset, embedded_document_size); - - return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; } - std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + + /*! + @brief Calculates the size necessary to serialize the JSON value @a j with its @a name + @return The calculated size for the BSON document entry for @a j with the given @a name. + */ + static std::size_t calc_bson_element_size(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + const auto header_size = calc_bson_entry_header_size(name); + switch (j.type()) + { + // LCOV_EXCL_START + default: + assert(false); + return 0ul; + // LCOV_EXCL_STOP + case value_t::object: + return header_size + calc_bson_object_size(*j.m_value.object); + case value_t::array: + return header_size + calc_bson_array_size(*j.m_value.array); + case value_t::boolean: + return header_size + 1ul; + case value_t::number_float: + return header_size + 8ul; + case value_t::number_integer: + return header_size + calc_bson_integer_size(j.m_value.number_integer); + case value_t::number_unsigned: + return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned); + case value_t::string: + return header_size + calc_bson_string_size(*j.m_value.string); + case value_t::null: + return header_size + 0ul; + }; + } + + + /*! + @brief Serializes the JSON value @a j to BSON and associates it with the key @a name. + @param name The name to associate with the JSON entity @a j within the current BSON document + @return The size of the bson entry + */ + void write_bson_element(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) { // LCOV_EXCL_START default: assert(false); - break; + return; // LCOV_EXCL_STOP case value_t::object: - return write_bson_object_internal(name, j); + return write_bson_object_entry(name, *j.m_value.object); case value_t::array: - return write_bson_array(name, j); + return write_bson_array(name, *j.m_value.array); case value_t::boolean: - return write_bson_boolean(name, j); + return write_bson_boolean(name, j.m_value.boolean); case value_t::number_float: - return write_bson_double(name, j); + return write_bson_double(name, j.m_value.number_float); case value_t::number_integer: - return write_bson_integer(name, j); + return write_bson_integer(name, j.m_value.number_integer); case value_t::number_unsigned: - return write_bson_unsigned(name, j); + return write_bson_unsigned(name, j.m_value.number_unsigned); case value_t::string: - return write_bson_string(name, j); + return write_bson_string(name, *j.m_value.string); case value_t::null: - return write_bson_null(name, j); + return write_bson_null(name); }; + } - return 0ul; + /*! + @brief Calculates the size of the BSON serialization of the given + JSON-object @a j. + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) + { + std::size_t document_size = 0; + + for (const auto& el : value) + { + document_size += calc_bson_element_size(el.first, el.second); + } + + return sizeof(std::int32_t) + document_size + 1ul; } /*! @param[in] j JSON value to serialize @pre j.type() == value_t::object */ - std::size_t write_bson_object(const BasicJsonType& j) + void write_bson_object(const typename BasicJsonType::object_t& value) { - assert(j.type() == value_t::object); - auto document_size_offset = oa->reserve_characters(4ul); - std::int32_t document_size = 5ul; + write_number(calc_bson_object_size(value)); - for (const auto& el : *j.m_value.object) + for (const auto& el : value) { - document_size += write_bson_object_entry(el.first, el.second); + write_bson_element(el.first, el.second); } oa->write_character(static_cast(0x00)); - write_number_at(document_size_offset, document_size); - return document_size; } /*! @@ -873,7 +965,7 @@ class binary_writer case value_t::discarded: break; case value_t::object: - write_bson_object(j); + write_bson_object(*j.m_value.object); break; } } @@ -909,35 +1001,6 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } - /* - @brief write a number to output in little endian format - - @param[in] offset The offset where to start writing - @param[in] n number of type @a NumberType - @tparam NumberType the type of the number - @tparam OutputIsLittleEndian Set to true if output data is - required to be little endian - */ - template - void write_number_at(std::size_t offset, const NumberType n) - { - // step 1: write number to array of length NumberType - std::array vec; - std::memcpy(vec.data(), &n, sizeof(NumberType)); - - // step 2: write array to output (with possible reordering) - // LCOV_EXCL_START - if (is_little_endian && !OutputIsLittleEndian) - { - // reverse byte order prior to conversion if necessary - std::reverse(vec.begin(), vec.end()); - } - // LCOV_EXCL_STOP - - oa->write_characters_at(offset, vec.data(), sizeof(NumberType)); - } - - // UBJSON: write number (floating point) template::value, int>::type = 0> diff --git a/include/nlohmann/detail/output/output_adapters.hpp b/include/nlohmann/detail/output/output_adapters.hpp index 64960011..ff86a6e1 100644 --- a/include/nlohmann/detail/output/output_adapters.hpp +++ b/include/nlohmann/detail/output/output_adapters.hpp @@ -18,8 +18,6 @@ template struct output_adapter_protocol { virtual void write_character(CharType c) = 0; virtual void write_characters(const CharType* s, std::size_t length) = 0; - virtual void write_characters_at(std::size_t position, const CharType* s, std::size_t length) = 0; - virtual std::size_t reserve_characters(std::size_t length) = 0; virtual ~output_adapter_protocol() = default; }; @@ -44,18 +42,6 @@ class output_vector_adapter : public output_adapter_protocol std::copy(s, s + length, std::back_inserter(v)); } - void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override - { - std::copy(s, s + length, std::begin(v) + position); - } - - std::size_t reserve_characters(std::size_t length) override - { - const auto position = v.size(); - std::fill_n(std::back_inserter(v), length, static_cast(0x00)); - return position; - } - private: std::vector& v; }; @@ -77,22 +63,6 @@ class output_stream_adapter : public output_adapter_protocol stream.write(s, static_cast(length)); } - void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override - { - const auto orig_offset = stream.tellp(); - stream.seekp(static_cast::pos_type>(position)); - stream.write(s, static_cast(length)); - stream.seekp(orig_offset); - } - - std::size_t reserve_characters(std::size_t length) override - { - const auto position = stream.tellp(); - std::vector empty(length, static_cast(0)); - stream.write(empty.data(), length); - return static_cast(position); - } - private: std::basic_ostream& stream; }; @@ -114,19 +84,6 @@ class output_string_adapter : public output_adapter_protocol str.append(s, length); } - void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override - { - std::copy(s, s + length, std::begin(str) + position); - } - - std::size_t reserve_characters(std::size_t length) override - { - const auto position = str.size(); - std::fill_n(std::back_inserter(str), length, static_cast(0x00)); - return position; - } - - private: StringType& str; }; diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index c5d2e0db..1b61e995 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -6594,9 +6594,45 @@ class basic_json /*! @brief Serializes the given JSON object `j` to BSON and returns a vector containing the corresponding BSON-representation. - @param j The JSON object to convert to BSON. - @return The BSON representation of the JSON input `j`. - @pre The input `j` shall be an object: `j.is_object() == true` + + BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are + stored as a single entity (a so-called document). + + The library uses the following mapping from JSON values types to BSON types: + + JSON value type | value/range | BSON type | marker + --------------- | --------------------------------- | ----------- | ------ + null | `null` | null | 0x0A + boolean | `true`, `false` | boolean | 0x08 + number_integer | -9223372036854775808..-2147483649 | int64 | 0x12 + number_integer | -2147483648..2147483647 | int32 | 0x10 + number_integer | 2147483648..9223372036854775807 | int64 | 0x12 + number_unsigned | 0..2147483647 | int32 | 0x10 + number_unsigned | 2147483648..9223372036854775807 | int64 | 0x12 + number_float | *any value* | double | 0x01 + string | *any value* | string | 0x02 + array | *any value* | document | 0x04 + object | *any value* | document | 0x03 + + @warning The mapping is **incomplete**, since only JSON-objects (and things + contained therein) can be serialized to BSON. + + @pre The input `j` is required to be an object: `j.is_object() == true` + + @note Any BSON output created via @ref to_bson can be successfully parsed + by @ref from_bson. + + @param[in] j JSON value to serialize + @return BSON serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @sa http://bsonspec.org/spec.html + @sa @ref from_bson(detail::input_adapter, const bool strict) for the + analogous deserialization + @sa @ref to_ubjson(const basic_json&) for the related UBJSON format + @sa @ref to_cbor(const basic_json&) for the related CBOR format + @sa @ref to_msgpack(const basic_json&) for the related MessagePack format */ static std::vector to_bson(const basic_json& j) { @@ -6611,6 +6647,7 @@ class basic_json @param j The JSON object to convert to BSON. @param o The output adapter that receives the binary BSON representation. @pre The input `j` shall be an object: `j.is_object() == true` + @sa @ref to_bson(const basic_json&) */ static void to_bson(const basic_json& j, detail::output_adapter o) { diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 52fd79ca..48b17d17 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -5839,8 +5839,6 @@ template struct output_adapter_protocol { virtual void write_character(CharType c) = 0; virtual void write_characters(const CharType* s, std::size_t length) = 0; - virtual void write_characters_at(std::size_t position, const CharType* s, std::size_t length) = 0; - virtual std::size_t reserve_characters(std::size_t length) = 0; virtual ~output_adapter_protocol() = default; }; @@ -5865,18 +5863,6 @@ class output_vector_adapter : public output_adapter_protocol std::copy(s, s + length, std::back_inserter(v)); } - void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override - { - std::copy(s, s + length, std::begin(v) + position); - } - - std::size_t reserve_characters(std::size_t length) override - { - const auto position = v.size(); - std::fill_n(std::back_inserter(v), length, static_cast(0x00)); - return position; - } - private: std::vector& v; }; @@ -5898,22 +5884,6 @@ class output_stream_adapter : public output_adapter_protocol stream.write(s, static_cast(length)); } - void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override - { - const auto orig_offset = stream.tellp(); - stream.seekp(static_cast::pos_type>(position)); - stream.write(s, static_cast(length)); - stream.seekp(orig_offset); - } - - std::size_t reserve_characters(std::size_t length) override - { - const auto position = stream.tellp(); - std::vector empty(length, static_cast(0)); - stream.write(empty.data(), length); - return static_cast(position); - } - private: std::basic_ostream& stream; }; @@ -5935,19 +5905,6 @@ class output_string_adapter : public output_adapter_protocol str.append(s, length); } - void write_characters_at(std::size_t position, const CharType* s, std::size_t length) override - { - std::copy(s, s + length, std::begin(str) + position); - } - - std::size_t reserve_characters(std::size_t length) override - { - const auto position = str.size(); - std::fill_n(std::back_inserter(str), length, static_cast(0x00)); - return position; - } - - private: StringType& str; }; @@ -7896,6 +7853,7 @@ class binary_reader // #include + namespace nlohmann { namespace detail @@ -8563,187 +8521,278 @@ class binary_writer } } - std::size_t write_bson_boolean(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @return The size of a BSON document entry header, including the id marker and the entry name size (and its null-terminator). + */ + static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { - oa->write_character(static_cast(0x08)); // boolean + return /*id*/ 1ul + name.size() + /*zero-terminator*/1u; + } + + /*! + @brief Writes the given @a element_type and @a name to the output adapter + */ + void write_bson_entry_header(const typename BasicJsonType::string_t& name, std::uint8_t element_type) + { + oa->write_character(static_cast(element_type)); // boolean oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); - oa->write_character(j.m_value.boolean ? static_cast(0x01) : static_cast(0x00)); - return /*id*/ 1ul + name.size() + 1u + /*boolean value*/ 1u; } - std::size_t write_bson_double(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and boolean value @a value + */ + void write_bson_boolean(const typename BasicJsonType::string_t& name, const bool value) { - oa->write_character(static_cast(0x01)); // double - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - write_number(j.m_value.number_float); - return /*id*/ 1ul + name.size() + 1u + /*double value*/ 8u; + write_bson_entry_header(name, 0x08); + oa->write_character(value ? static_cast(0x01) : static_cast(0x00)); } - std::size_t write_bson_string(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and double value @a value + */ + void write_bson_double(const typename BasicJsonType::string_t& name, const double value) { - oa->write_character(static_cast(0x02)); // string (UTF-8) - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(j.m_value.string->size() + 1ul)); - oa->write_characters( - reinterpret_cast(j.m_value.string->c_str()), - j.m_value.string->size() + 1); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t) + j.m_value.string->size() + 1ul; + write_bson_entry_header(name, 0x01); + write_number(value); } - std::size_t write_bson_null(const typename BasicJsonType::string_t& name, const BasicJsonType&) + /*! + @return The size of the BSON-encoded string in @a value + */ + static std::size_t calc_bson_string_size(const typename BasicJsonType::string_t& value) { - oa->write_character(static_cast(0x0A)); // null - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - return /*id*/ 1ul + name.size() + 1ul; + return sizeof(std::int32_t) + value.size() + 1ul; } - std::size_t write_bson_integer(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and string value @a value + */ + void write_bson_string(const typename BasicJsonType::string_t& name, const typename BasicJsonType::string_t& value) { - auto n = j.m_value.number_integer; - if ((std::numeric_limits::min)() <= n and n <= (std::numeric_limits::max)()) + write_bson_entry_header(name, 0x02); + + write_number(static_cast(value.size() + 1ul)); + oa->write_characters( + reinterpret_cast(value.c_str()), + value.size() + 1); + } + + /*! + @brief Writes a BSON element with key @a name and null value + */ + void write_bson_null(const typename BasicJsonType::string_t& name) + { + write_bson_entry_header(name, 0x0A); + } + + /*! + @return The size of the BSON-encoded integer @a value + */ + static std::size_t calc_bson_integer_size(const std::int64_t value) + { + if ((std::numeric_limits::min)() <= value and value <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x10)); // int32 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(n)); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + return sizeof(std::int32_t); } else { - oa->write_character(static_cast(0x12)); // int64 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(j.m_value.number_integer)); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); + return sizeof(std::int64_t); } } - std::size_t write_bson_unsigned(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and integer @a value + */ + void write_bson_integer(const typename BasicJsonType::string_t& name, const std::int64_t value) { - auto n = j.m_value.number_integer; - if (n <= static_cast((std::numeric_limits::max)())) + if ((std::numeric_limits::min)() <= value and value <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x10)); // int32 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(n)); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int32_t); + write_bson_entry_header(name, 0x10); // int32 + write_number(static_cast(value)); } else { - oa->write_character(static_cast(0x12)); // int64 - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - write_number(static_cast(j.m_value.number_integer)); - - return /*id*/ 1ul + name.size() + 1ul + sizeof(std::int64_t); + write_bson_entry_header(name, 0x12); // int64 + write_number(static_cast(value)); } } - std::size_t write_bson_object_internal(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + + /*! + @return The size of the BSON-encoded unsigned integer in @a j + */ + static std::size_t calc_bson_unsigned_size(const std::uint64_t value) { - oa->write_character(static_cast(0x03)); // object - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - auto const embedded_document_size = write_bson_object(j); - - return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; + if (value <= static_cast((std::numeric_limits::max)())) + { + return sizeof(std::int32_t); + } + else + { + return sizeof(std::int64_t); + } } - std::size_t write_bson_array(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + /*! + @brief Writes a BSON element with key @a name and unsigned @a value + */ + void write_bson_unsigned(const typename BasicJsonType::string_t& name, const std::uint64_t value) { - oa->write_character(static_cast(0x04)); // object - oa->write_characters( - reinterpret_cast(name.c_str()), - name.size() + 1u); - - - auto document_size_offset = oa->reserve_characters(4ul); - std::int32_t embedded_document_size = 5ul; - - for (const auto& el : *j.m_value.array) + if (value <= static_cast((std::numeric_limits::max)())) { - embedded_document_size += write_bson_object_entry("", el); + write_bson_entry_header(name, 0x10); // int32 + write_number(static_cast(value)); + } + else + { + write_bson_entry_header(name, 0x12); // int64 + write_number(static_cast(value)); + } + } + + /*! + @brief Writes a BSON element with key @a name and object @a value + */ + void write_bson_object_entry(const typename BasicJsonType::string_t& name, const typename BasicJsonType::object_t& value) + { + write_bson_entry_header(name, 0x03); // object + write_bson_object(value); + } + + + /*! + @return The size of the BSON-encoded array @a value + */ + static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value) + { + std::size_t embedded_document_size = 0ul; + + for (const auto& el : value) + { + embedded_document_size += calc_bson_element_size("", el); + } + + return sizeof(std::int32_t) + embedded_document_size + 1ul; + } + + /*! + @brief Writes a BSON element with key @a name and array @a value + */ + void write_bson_array(const typename BasicJsonType::string_t& name, const typename BasicJsonType::array_t& value) + { + write_bson_entry_header(name, 0x04); // array + write_number(calc_bson_array_size(value)); + + for (const auto& el : value) + { + write_bson_element("", el); } oa->write_character(static_cast(0x00)); - write_number_at(document_size_offset, embedded_document_size); - - return /*id*/ 1ul + name.size() + 1ul + embedded_document_size; } - std::size_t write_bson_object_entry(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + + /*! + @brief Calculates the size necessary to serialize the JSON value @a j with its @a name + @return The calculated size for the BSON document entry for @a j with the given @a name. + */ + static std::size_t calc_bson_element_size(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + { + const auto header_size = calc_bson_entry_header_size(name); + switch (j.type()) + { + // LCOV_EXCL_START + default: + assert(false); + return 0ul; + // LCOV_EXCL_STOP + case value_t::object: + return header_size + calc_bson_object_size(*j.m_value.object); + case value_t::array: + return header_size + calc_bson_array_size(*j.m_value.array); + case value_t::boolean: + return header_size + 1ul; + case value_t::number_float: + return header_size + 8ul; + case value_t::number_integer: + return header_size + calc_bson_integer_size(j.m_value.number_integer); + case value_t::number_unsigned: + return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned); + case value_t::string: + return header_size + calc_bson_string_size(*j.m_value.string); + case value_t::null: + return header_size + 0ul; + }; + } + + + /*! + @brief Serializes the JSON value @a j to BSON and associates it with the key @a name. + @param name The name to associate with the JSON entity @a j within the current BSON document + @return The size of the bson entry + */ + void write_bson_element(const typename BasicJsonType::string_t& name, const BasicJsonType& j) { switch (j.type()) { // LCOV_EXCL_START default: assert(false); - break; + return; // LCOV_EXCL_STOP case value_t::object: - return write_bson_object_internal(name, j); + return write_bson_object_entry(name, *j.m_value.object); case value_t::array: - return write_bson_array(name, j); + return write_bson_array(name, *j.m_value.array); case value_t::boolean: - return write_bson_boolean(name, j); + return write_bson_boolean(name, j.m_value.boolean); case value_t::number_float: - return write_bson_double(name, j); + return write_bson_double(name, j.m_value.number_float); case value_t::number_integer: - return write_bson_integer(name, j); + return write_bson_integer(name, j.m_value.number_integer); case value_t::number_unsigned: - return write_bson_unsigned(name, j); + return write_bson_unsigned(name, j.m_value.number_unsigned); case value_t::string: - return write_bson_string(name, j); + return write_bson_string(name, *j.m_value.string); case value_t::null: - return write_bson_null(name, j); + return write_bson_null(name); }; + } - return 0ul; + /*! + @brief Calculates the size of the BSON serialization of the given + JSON-object @a j. + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) + { + std::size_t document_size = 0; + + for (const auto& el : value) + { + document_size += calc_bson_element_size(el.first, el.second); + } + + return sizeof(std::int32_t) + document_size + 1ul; } /*! @param[in] j JSON value to serialize @pre j.type() == value_t::object */ - std::size_t write_bson_object(const BasicJsonType& j) + void write_bson_object(const typename BasicJsonType::object_t& value) { - assert(j.type() == value_t::object); - auto document_size_offset = oa->reserve_characters(4ul); - std::int32_t document_size = 5ul; + write_number(calc_bson_object_size(value)); - for (const auto& el : *j.m_value.object) + for (const auto& el : value) { - document_size += write_bson_object_entry(el.first, el.second); + write_bson_element(el.first, el.second); } oa->write_character(static_cast(0x00)); - write_number_at(document_size_offset, document_size); - return document_size; } /*! @@ -8760,7 +8809,7 @@ class binary_writer case value_t::discarded: break; case value_t::object: - write_bson_object(j); + write_bson_object(*j.m_value.object); break; } } @@ -8796,35 +8845,6 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } - /* - @brief write a number to output in little endian format - - @param[in] offset The offset where to start writing - @param[in] n number of type @a NumberType - @tparam NumberType the type of the number - @tparam OutputIsLittleEndian Set to true if output data is - required to be little endian - */ - template - void write_number_at(std::size_t offset, const NumberType n) - { - // step 1: write number to array of length NumberType - std::array vec; - std::memcpy(vec.data(), &n, sizeof(NumberType)); - - // step 2: write array to output (with possible reordering) - // LCOV_EXCL_START - if (is_little_endian && !OutputIsLittleEndian) - { - // reverse byte order prior to conversion if necessary - std::reverse(vec.begin(), vec.end()); - } - // LCOV_EXCL_STOP - - oa->write_characters_at(offset, vec.data(), sizeof(NumberType)); - } - - // UBJSON: write number (floating point) template::value, int>::type = 0> @@ -18147,9 +18167,45 @@ class basic_json /*! @brief Serializes the given JSON object `j` to BSON and returns a vector containing the corresponding BSON-representation. - @param j The JSON object to convert to BSON. - @return The BSON representation of the JSON input `j`. - @pre The input `j` shall be an object: `j.is_object() == true` + + BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are + stored as a single entity (a so-called document). + + The library uses the following mapping from JSON values types to BSON types: + + JSON value type | value/range | BSON type | marker + --------------- | --------------------------------- | ----------- | ------ + null | `null` | null | 0x0A + boolean | `true`, `false` | boolean | 0x08 + number_integer | -9223372036854775808..-2147483649 | int64 | 0x12 + number_integer | -2147483648..2147483647 | int32 | 0x10 + number_integer | 2147483648..9223372036854775807 | int64 | 0x12 + number_unsigned | 0..2147483647 | int32 | 0x10 + number_unsigned | 2147483648..9223372036854775807 | int64 | 0x12 + number_float | *any value* | double | 0x01 + string | *any value* | string | 0x02 + array | *any value* | document | 0x04 + object | *any value* | document | 0x03 + + @warning The mapping is **incomplete**, since only JSON-objects (and things + contained therein) can be serialized to BSON. + + @pre The input `j` is required to be an object: `j.is_object() == true` + + @note Any BSON output created via @ref to_bson can be successfully parsed + by @ref from_bson. + + @param[in] j JSON value to serialize + @return BSON serialization as byte vector + + @complexity Linear in the size of the JSON value @a j. + + @sa http://bsonspec.org/spec.html + @sa @ref from_bson(detail::input_adapter, const bool strict) for the + analogous deserialization + @sa @ref to_ubjson(const basic_json&) for the related UBJSON format + @sa @ref to_cbor(const basic_json&) for the related CBOR format + @sa @ref to_msgpack(const basic_json&) for the related MessagePack format */ static std::vector to_bson(const basic_json& j) { @@ -18164,6 +18220,7 @@ class basic_json @param j The JSON object to convert to BSON. @param o The output adapter that receives the binary BSON representation. @pre The input `j` shall be an object: `j.is_object() == true` + @sa @ref to_bson(const basic_json&) */ static void to_bson(const basic_json& j, detail::output_adapter o) { diff --git a/test/src/unit-alt-string.cpp b/test/src/unit-alt-string.cpp index d866ed70..356835c0 100644 --- a/test/src/unit-alt-string.cpp +++ b/test/src/unit-alt-string.cpp @@ -102,16 +102,6 @@ class alt_string str_impl.resize(n, c); } - auto begin() -> std::string::iterator - { - return str_impl.begin(); - } - - auto end() -> std::string::iterator - { - return str_impl.end(); - } - template bool operator<(const op_type& op) const { From 858e75c4df6ea62973feb70d10af5c3531e37384 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 7 Oct 2018 18:39:18 +0200 Subject: [PATCH 26/77] :rotating_light: fixed some clang-tidy warnings --- include/nlohmann/adl_serializer.hpp | 2 +- .../nlohmann/detail/conversions/from_json.hpp | 8 +- .../nlohmann/detail/conversions/to_chars.hpp | 19 +- .../nlohmann/detail/conversions/to_json.hpp | 8 +- include/nlohmann/detail/exceptions.hpp | 4 +- .../nlohmann/detail/input/binary_reader.hpp | 10 +- .../nlohmann/detail/input/input_adapters.hpp | 15 +- include/nlohmann/detail/input/json_sax.hpp | 30 +-- include/nlohmann/detail/input/lexer.hpp | 19 +- include/nlohmann/detail/input/parser.hpp | 4 +- .../detail/iterators/internal_iterator.hpp | 4 +- .../nlohmann/detail/iterators/iter_impl.hpp | 4 +- .../detail/iterators/iteration_proxy.hpp | 7 +- .../iterators/json_reverse_iterator.hpp | 4 +- .../detail/iterators/primitive_iterator.hpp | 4 +- include/nlohmann/detail/json_pointer.hpp | 2 +- include/nlohmann/detail/json_ref.hpp | 8 +- include/nlohmann/detail/meta/cpp_future.hpp | 4 +- include/nlohmann/detail/meta/detected.hpp | 4 +- include/nlohmann/detail/meta/is_sax.hpp | 4 +- include/nlohmann/detail/meta/type_traits.hpp | 4 +- include/nlohmann/detail/meta/void_t.hpp | 4 +- .../nlohmann/detail/output/binary_writer.hpp | 18 +- .../detail/output/output_adapters.hpp | 4 +- include/nlohmann/detail/output/serializer.hpp | 7 +- include/nlohmann/detail/value_t.hpp | 4 +- include/nlohmann/json.hpp | 2 +- include/nlohmann/json_fwd.hpp | 2 +- single_include/nlohmann/json.hpp | 209 +++++++++--------- 29 files changed, 214 insertions(+), 204 deletions(-) diff --git a/include/nlohmann/adl_serializer.hpp b/include/nlohmann/adl_serializer.hpp index 0c28d1c7..35be76fd 100644 --- a/include/nlohmann/adl_serializer.hpp +++ b/include/nlohmann/adl_serializer.hpp @@ -46,4 +46,4 @@ struct adl_serializer ::nlohmann::to_json(j, std::forward(val)); } }; -} +} // namespace nlohmann diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp index 2375d066..358b1c65 100644 --- a/include/nlohmann/detail/conversions/from_json.hpp +++ b/include/nlohmann/detail/conversions/from_json.hpp @@ -299,7 +299,7 @@ void from_json(const BasicJsonType& j, std::pair& p) } template -void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence) +void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence /*unused*/) { t = std::make_tuple(j.at(Idx).template get::type>()...); } @@ -358,7 +358,7 @@ struct from_json_fn return from_json(j, val); } }; -} +} // namespace detail /// namespace to hold default `from_json` function /// to see why this is required: @@ -366,5 +366,5 @@ struct from_json_fn namespace { constexpr const auto& from_json = detail::static_const::value; -} -} +} // namespace +} // namespace nlohmann diff --git a/include/nlohmann/detail/conversions/to_chars.hpp b/include/nlohmann/detail/conversions/to_chars.hpp index a13d258c..b32e1766 100644 --- a/include/nlohmann/detail/conversions/to_chars.hpp +++ b/include/nlohmann/detail/conversions/to_chars.hpp @@ -47,10 +47,9 @@ struct diyfp // f * 2^e { static constexpr int kPrecision = 64; // = q - uint64_t f; - int e; + uint64_t f = 0; + int e = 0; - constexpr diyfp() noexcept : f(0), e(0) {} constexpr diyfp(uint64_t f_, int e_) noexcept : f(f_), e(e_) {} /*! @@ -62,7 +61,7 @@ struct diyfp // f * 2^e assert(x.e == y.e); assert(x.f >= y.f); - return diyfp(x.f - y.f, x.e); + return {x.f - y.f, x.e}; } /*! @@ -127,7 +126,7 @@ struct diyfp // f * 2^e const uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32); - return diyfp(h, x.e + y.e + 64); + return {h, x.e + y.e + 64}; } /*! @@ -158,7 +157,7 @@ struct diyfp // f * 2^e assert(delta >= 0); assert(((x.f << delta) >> delta) == x.f); - return diyfp(x.f << delta, target_exponent); + return {x.f << delta, target_exponent}; } }; @@ -461,7 +460,7 @@ inline cached_power get_cached_power_for_binary_exponent(int e) assert(e >= -1500); assert(e <= 1500); const int f = kAlpha - e - 1; - const int k = (f * 78913) / (1 << 18) + (f > 0); + const int k = (f * 78913) / (1 << 18) + static_cast(f > 0); const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep; assert(index >= 0); @@ -609,7 +608,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, const diyfp one(uint64_t{1} << -M_plus.e, M_plus.e); - uint32_t p1 = static_cast(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.) + auto p1 = static_cast(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.) uint64_t p2 = M_plus.f & (one.f - 1); // p2 = f mod 2^-e // 1) @@ -928,7 +927,7 @@ inline char* append_exponent(char* buf, int e) *buf++ = '+'; } - uint32_t k = static_cast(e); + auto k = static_cast(e); if (k < 10) { // Always print at least two digits in the exponent. @@ -1046,7 +1045,7 @@ format. Returns an iterator pointing past-the-end of the decimal representation. @note The result is NOT null-terminated. */ template -char* to_chars(char* first, char* last, FloatType value) +char* to_chars(char* first, const char* last, FloatType value) { static_cast(last); // maybe unused - fix warning assert(std::isfinite(value)); diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp index b944bf6c..d274eadd 100644 --- a/include/nlohmann/detail/conversions/to_json.hpp +++ b/include/nlohmann/detail/conversions/to_json.hpp @@ -312,7 +312,7 @@ void to_json(BasicJsonType& j, const T& b) } template -void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence) +void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence /*unused*/) { j = {std::get(t)...}; } @@ -332,11 +332,11 @@ struct to_json_fn return to_json(j, std::forward(val)); } }; -} +} // namespace detail /// namespace to hold default `to_json` function namespace { constexpr const auto& to_json = detail::static_const::value; -} -} +} // namespace +} // namespace nlohmann diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index b73d7b1f..d3d4c224 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -326,5 +326,5 @@ class other_error : public exception private: other_error(int id_, const char* what_arg) : exception(id_, what_arg) {} }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 6d72cbf0..bb0c982b 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -403,8 +403,8 @@ class binary_reader return false; } - const unsigned char byte1 = static_cast(byte1_raw); - const unsigned char byte2 = static_cast(byte2_raw); + const auto byte1 = static_cast(byte1_raw); + const auto byte2 = static_cast(byte2_raw); // code from RFC 7049, Appendix D, Figure 3: // As half-precision floating-point numbers were only added @@ -1039,6 +1039,7 @@ class binary_reader } if (len != std::size_t(-1)) + { for (std::size_t i = 0; i < len; ++i) { if (JSON_UNLIKELY(not parse_cbor_internal())) @@ -1046,6 +1047,7 @@ class binary_reader return false; } } + } else { while (get() != 0xFF) @@ -1696,5 +1698,5 @@ class binary_reader /// the SAX parser json_sax_t* sax = nullptr; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp index 1ae77b5e..706c5c5b 100644 --- a/include/nlohmann/detail/input/input_adapters.hpp +++ b/include/nlohmann/detail/input/input_adapters.hpp @@ -71,6 +71,8 @@ class input_stream_adapter : public input_adapter_protocol // delete because of pointer members input_stream_adapter(const input_stream_adapter&) = delete; input_stream_adapter& operator=(input_stream_adapter&) = delete; + input_stream_adapter(input_stream_adapter&&) = delete; + input_stream_adapter& operator=(input_stream_adapter&&) = delete; // std::istream/std::streambuf use std::char_traits::to_int_type, to // ensure that std::char_traits::eof() and the character 0xFF do not @@ -97,6 +99,9 @@ class input_buffer_adapter : public input_adapter_protocol // delete because of pointer members input_buffer_adapter(const input_buffer_adapter&) = delete; input_buffer_adapter& operator=(input_buffer_adapter&) = delete; + input_buffer_adapter(input_buffer_adapter&&) = delete; + input_buffer_adapter& operator=(input_buffer_adapter&&) = delete; + ~input_buffer_adapter() override = default; std::char_traits::int_type get_character() noexcept override { @@ -131,7 +136,7 @@ struct wide_string_input_helper else { // get the current character - const int wc = static_cast(str[current_wchar++]); + const auto wc = static_cast(str[current_wchar++]); // UTF-32 to UTF-8 encoding if (wc < 0x80) @@ -186,7 +191,7 @@ struct wide_string_input_helper else { // get the current character - const int wc = static_cast(str[current_wchar++]); + const auto wc = static_cast(str[current_wchar++]); // UTF-16 to UTF-8 encoding if (wc < 0x80) @@ -211,7 +216,7 @@ struct wide_string_input_helper { if (current_wchar < str.size()) { - const int wc2 = static_cast(str[current_wchar++]); + const auto wc2 = static_cast(str[current_wchar++]); const int charcode = 0x10000 + (((wc & 0x3FF) << 10) | (wc2 & 0x3FF)); utf8_bytes[0] = 0xf0 | (charcode >> 18); utf8_bytes[1] = 0x80 | ((charcode >> 12) & 0x3F); @@ -381,5 +386,5 @@ class input_adapter /// the actual adapter input_adapter_t ia = nullptr; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/input/json_sax.hpp b/include/nlohmann/detail/input/json_sax.hpp index 1705a861..8cc18abc 100644 --- a/include/nlohmann/detail/input/json_sax.hpp +++ b/include/nlohmann/detail/input/json_sax.hpp @@ -181,7 +181,7 @@ class json_sax_dom_parser return true; } - bool number_float(number_float_t val, const string_t&) + bool number_float(number_float_t val, const string_t& /*unused*/) { handle_value(val); return true; @@ -238,7 +238,7 @@ class json_sax_dom_parser return true; } - bool parse_error(std::size_t, const std::string&, + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& ex) { errored = true; @@ -358,7 +358,7 @@ class json_sax_dom_callback_parser return true; } - bool number_float(number_float_t val, const string_t&) + bool number_float(number_float_t val, const string_t& /*unused*/) { handle_value(val); return true; @@ -496,7 +496,7 @@ class json_sax_dom_callback_parser return true; } - bool parse_error(std::size_t, const std::string&, + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& ex) { errored = true; @@ -642,37 +642,37 @@ class json_sax_acceptor return true; } - bool boolean(bool) + bool boolean(bool /*unused*/) { return true; } - bool number_integer(number_integer_t) + bool number_integer(number_integer_t /*unused*/) { return true; } - bool number_unsigned(number_unsigned_t) + bool number_unsigned(number_unsigned_t /*unused*/) { return true; } - bool number_float(number_float_t, const string_t&) + bool number_float(number_float_t /*unused*/, const string_t& /*unused*/) { return true; } - bool string(string_t&) + bool string(string_t& /*unused*/) { return true; } - bool start_object(std::size_t = std::size_t(-1)) + bool start_object(std::size_t /*unused*/ = std::size_t(-1)) { return true; } - bool key(string_t&) + bool key(string_t& /*unused*/) { return true; } @@ -682,7 +682,7 @@ class json_sax_acceptor return true; } - bool start_array(std::size_t = std::size_t(-1)) + bool start_array(std::size_t /*unused*/ = std::size_t(-1)) { return true; } @@ -692,11 +692,11 @@ class json_sax_acceptor return true; } - bool parse_error(std::size_t, const std::string&, const detail::exception&) + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/) { return false; } }; -} +} // namespace detail -} +} // namespace nlohmann diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index b4ff65fb..4470e932 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -104,7 +104,10 @@ class lexer // delete because of pointer members lexer(const lexer&) = delete; + lexer(lexer&&) noexcept = default; lexer& operator=(lexer&) = delete; + lexer& operator=(lexer&&) noexcept = default; + ~lexer() = default; private: ///////////////////// @@ -1208,16 +1211,8 @@ scan_number_done: { if (get() == 0xEF) { - if (get() == 0xBB and get() == 0xBF) - { - // we completely parsed the BOM - return true; - } - else - { - // after reading 0xEF, an unexpected character followed - return false; - } + // check if we completely parse the BOM + return get() == 0xBB and get() == 0xBF; } else { @@ -1329,5 +1324,5 @@ scan_number_done: /// the decimal point const char decimal_point_char = '.'; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/input/parser.hpp b/include/nlohmann/detail/input/parser.hpp index 70d92a26..1ee1e6bf 100644 --- a/include/nlohmann/detail/input/parser.hpp +++ b/include/nlohmann/detail/input/parser.hpp @@ -484,5 +484,5 @@ class parser /// whether to throw exceptions in case of errors const bool allow_exceptions = true; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/iterators/internal_iterator.hpp b/include/nlohmann/detail/iterators/internal_iterator.hpp index d9b8fb29..2c81f723 100644 --- a/include/nlohmann/detail/iterators/internal_iterator.hpp +++ b/include/nlohmann/detail/iterators/internal_iterator.hpp @@ -21,5 +21,5 @@ template struct internal_iterator /// generic iterator for all other types primitive_iterator_t primitive_iterator {}; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/iterators/iter_impl.hpp b/include/nlohmann/detail/iterators/iter_impl.hpp index adcd8a37..6674c064 100644 --- a/include/nlohmann/detail/iterators/iter_impl.hpp +++ b/include/nlohmann/detail/iterators/iter_impl.hpp @@ -610,5 +610,5 @@ class iter_impl /// the actual iterator of the associated instance internal_iterator::type> m_it; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/iterators/iteration_proxy.hpp b/include/nlohmann/detail/iterators/iteration_proxy.hpp index f5dbb2c7..d4f90502 100644 --- a/include/nlohmann/detail/iterators/iteration_proxy.hpp +++ b/include/nlohmann/detail/iterators/iteration_proxy.hpp @@ -39,9 +39,6 @@ template class iteration_proxy public: explicit iteration_proxy_internal(IteratorType it) noexcept : anchor(it) {} - iteration_proxy_internal(const iteration_proxy_internal&) = default; - iteration_proxy_internal& operator=(const iteration_proxy_internal&) = default; - /// dereference operator (needed for range-based for) iteration_proxy_internal& operator*() { @@ -124,5 +121,5 @@ template class iteration_proxy return iteration_proxy_internal(container.end()); } }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/iterators/json_reverse_iterator.hpp b/include/nlohmann/detail/iterators/json_reverse_iterator.hpp index 2750de4a..f3b5b5db 100644 --- a/include/nlohmann/detail/iterators/json_reverse_iterator.hpp +++ b/include/nlohmann/detail/iterators/json_reverse_iterator.hpp @@ -115,5 +115,5 @@ class json_reverse_iterator : public std::reverse_iterator return it.operator * (); } }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/iterators/primitive_iterator.hpp b/include/nlohmann/detail/iterators/primitive_iterator.hpp index db3f8975..28d6f1a6 100644 --- a/include/nlohmann/detail/iterators/primitive_iterator.hpp +++ b/include/nlohmann/detail/iterators/primitive_iterator.hpp @@ -116,5 +116,5 @@ class primitive_iterator_t return *this; } }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index 320730ec..b2bc4727 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -693,4 +693,4 @@ class json_pointer /// the reference tokens std::vector reference_tokens; }; -} +} // namespace nlohmann diff --git a/include/nlohmann/detail/json_ref.hpp b/include/nlohmann/detail/json_ref.hpp index 8285be22..b9abc47a 100644 --- a/include/nlohmann/detail/json_ref.hpp +++ b/include/nlohmann/detail/json_ref.hpp @@ -31,9 +31,11 @@ class json_ref {} // class should be movable only - json_ref(json_ref&&) = default; + json_ref(json_ref&&) noexcept = default; json_ref(const json_ref&) = delete; json_ref& operator=(const json_ref&) = delete; + json_ref& operator=(json_ref&&) noexcept = default; + ~json_ref() = default; value_type moved_or_copied() const { @@ -59,5 +61,5 @@ class json_ref value_type* value_ref = nullptr; const bool is_rvalue; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/meta/cpp_future.hpp b/include/nlohmann/detail/meta/cpp_future.hpp index fa7478b8..948cd4fb 100644 --- a/include/nlohmann/detail/meta/cpp_future.hpp +++ b/include/nlohmann/detail/meta/cpp_future.hpp @@ -59,5 +59,5 @@ struct static_const template constexpr T static_const::value; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/meta/detected.hpp b/include/nlohmann/detail/meta/detected.hpp index ed1d6ac7..c1bd5476 100644 --- a/include/nlohmann/detail/meta/detected.hpp +++ b/include/nlohmann/detail/meta/detected.hpp @@ -52,5 +52,5 @@ using is_detected_exact = std::is_same>; template class Op, class... Args> using is_detected_convertible = std::is_convertible, To>; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/meta/is_sax.hpp b/include/nlohmann/detail/meta/is_sax.hpp index b4e1f3fd..b610beab 100644 --- a/include/nlohmann/detail/meta/is_sax.hpp +++ b/include/nlohmann/detail/meta/is_sax.hpp @@ -137,5 +137,5 @@ public: "Missing/invalid function: bool parse_error(std::size_t, const " "std::string&, const exception&)"); }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index bb932ef6..1a1a1744 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -247,5 +247,5 @@ struct is_compatible_type_impl < template struct is_compatible_type : is_compatible_type_impl {}; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/meta/void_t.hpp b/include/nlohmann/detail/meta/void_t.hpp index 2528ea84..a256f85a 100644 --- a/include/nlohmann/detail/meta/void_t.hpp +++ b/include/nlohmann/detail/meta/void_t.hpp @@ -9,5 +9,5 @@ template struct make_void using type = void; }; template using void_t = typename make_void::type; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 71e5ec81..17df41d8 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -540,9 +540,11 @@ class binary_writer case value_t::boolean: { if (add_prefix) + { oa->write_character(j.m_value.boolean ? static_cast('T') : static_cast('F')); + } break; } @@ -908,32 +910,32 @@ class binary_writer } } - static constexpr CharType get_cbor_float_prefix(float) + static constexpr CharType get_cbor_float_prefix(float /*unused*/) { return static_cast(0xFA); // Single-Precision Float } - static constexpr CharType get_cbor_float_prefix(double) + static constexpr CharType get_cbor_float_prefix(double /*unused*/) { return static_cast(0xFB); // Double-Precision Float } - static constexpr CharType get_msgpack_float_prefix(float) + static constexpr CharType get_msgpack_float_prefix(float /*unused*/) { return static_cast(0xCA); // float 32 } - static constexpr CharType get_msgpack_float_prefix(double) + static constexpr CharType get_msgpack_float_prefix(double /*unused*/) { return static_cast(0xCB); // float 64 } - static constexpr CharType get_ubjson_float_prefix(float) + static constexpr CharType get_ubjson_float_prefix(float /*unused*/) { return 'd'; // float 32 } - static constexpr CharType get_ubjson_float_prefix(double) + static constexpr CharType get_ubjson_float_prefix(double /*unused*/) { return 'D'; // float 64 } @@ -945,5 +947,5 @@ class binary_writer /// the output output_adapter_t oa = nullptr; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/output/output_adapters.hpp b/include/nlohmann/detail/output/output_adapters.hpp index ff86a6e1..0a37715c 100644 --- a/include/nlohmann/detail/output/output_adapters.hpp +++ b/include/nlohmann/detail/output/output_adapters.hpp @@ -109,5 +109,5 @@ class output_adapter private: output_adapter_t oa = nullptr; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index d4a258da..6088ebe8 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -53,6 +53,9 @@ class serializer // delete because of pointer members serializer(const serializer&) = delete; serializer& operator=(const serializer&) = delete; + serializer(serializer&&) noexcept = default; + serializer& operator=(serializer&&) noexcept = default; + ~serializer() = default; /*! @brief internal implementation of the serialization function @@ -627,5 +630,5 @@ class serializer /// the indentation string string_t indent_string; }; -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/detail/value_t.hpp b/include/nlohmann/detail/value_t.hpp index 326367c4..10d555b9 100644 --- a/include/nlohmann/detail/value_t.hpp +++ b/include/nlohmann/detail/value_t.hpp @@ -72,5 +72,5 @@ inline bool operator<(const value_t lhs, const value_t rhs) noexcept const auto r_index = static_cast(rhs); return l_index < order.size() and r_index < order.size() and order[l_index] < order[r_index]; } -} -} +} // namespace detail +} // namespace nlohmann diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 52c301cf..0b6a6fb5 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1866,7 +1866,7 @@ class basic_json @since version 1.0.0 */ - reference& operator=(basic_json other) noexcept ( + basic_json& operator=(basic_json other) noexcept ( std::is_nothrow_move_constructible::value and std::is_nothrow_move_assignable::value and std::is_nothrow_move_constructible::value and diff --git a/include/nlohmann/json_fwd.hpp b/include/nlohmann/json_fwd.hpp index 5ff0d753..32abba91 100644 --- a/include/nlohmann/json_fwd.hpp +++ b/include/nlohmann/json_fwd.hpp @@ -59,6 +59,6 @@ uses the standard template types. @since version 1.0.0 */ using json = basic_json<>; -} +} // namespace nlohmann #endif diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index a1a3d697..210fc88c 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -108,7 +108,7 @@ uses the standard template types. @since version 1.0.0 */ using json = basic_json<>; -} +} // namespace nlohmann #endif @@ -280,8 +280,8 @@ struct static_const template constexpr T static_const::value; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -312,8 +312,8 @@ template struct make_void using type = void; }; template using void_t = typename make_void::type; -} -} +} // namespace detail +} // namespace nlohmann // http://en.cppreference.com/w/cpp/experimental/is_detected @@ -364,8 +364,8 @@ using is_detected_exact = std::is_same>; template class Op, class... Args> using is_detected_convertible = std::is_convertible, To>; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -607,8 +607,8 @@ struct is_compatible_type_impl < template struct is_compatible_type : is_compatible_type_impl {}; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -939,8 +939,8 @@ class other_error : public exception private: other_error(int id_, const char* what_arg) : exception(id_, what_arg) {} }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -1017,8 +1017,8 @@ inline bool operator<(const value_t lhs, const value_t rhs) noexcept const auto r_index = static_cast(rhs); return l_index < order.size() and r_index < order.size() and order[l_index] < order[r_index]; } -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -1327,7 +1327,7 @@ void from_json(const BasicJsonType& j, std::pair& p) } template -void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence) +void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence /*unused*/) { t = std::make_tuple(j.at(Idx).template get::type>()...); } @@ -1386,7 +1386,7 @@ struct from_json_fn return from_json(j, val); } }; -} +} // namespace detail /// namespace to hold default `from_json` function /// to see why this is required: @@ -1394,8 +1394,8 @@ struct from_json_fn namespace { constexpr const auto& from_json = detail::static_const::value; -} -} +} // namespace +} // namespace nlohmann // #include @@ -1457,9 +1457,6 @@ template class iteration_proxy public: explicit iteration_proxy_internal(IteratorType it) noexcept : anchor(it) {} - iteration_proxy_internal(const iteration_proxy_internal&) = default; - iteration_proxy_internal& operator=(const iteration_proxy_internal&) = default; - /// dereference operator (needed for range-based for) iteration_proxy_internal& operator*() { @@ -1542,8 +1539,8 @@ template class iteration_proxy return iteration_proxy_internal(container.end()); } }; -} -} +} // namespace detail +} // namespace nlohmann namespace nlohmann @@ -1845,7 +1842,7 @@ void to_json(BasicJsonType& j, const T& b) } template -void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence) +void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence /*unused*/) { j = {std::get(t)...}; } @@ -1865,14 +1862,14 @@ struct to_json_fn return to_json(j, std::forward(val)); } }; -} +} // namespace detail /// namespace to hold default `to_json` function namespace { constexpr const auto& to_json = detail::static_const::value; -} -} +} // namespace +} // namespace nlohmann // #include @@ -1949,6 +1946,8 @@ class input_stream_adapter : public input_adapter_protocol // delete because of pointer members input_stream_adapter(const input_stream_adapter&) = delete; input_stream_adapter& operator=(input_stream_adapter&) = delete; + input_stream_adapter(input_stream_adapter&&) = delete; + input_stream_adapter& operator=(input_stream_adapter&&) = delete; // std::istream/std::streambuf use std::char_traits::to_int_type, to // ensure that std::char_traits::eof() and the character 0xFF do not @@ -1975,6 +1974,9 @@ class input_buffer_adapter : public input_adapter_protocol // delete because of pointer members input_buffer_adapter(const input_buffer_adapter&) = delete; input_buffer_adapter& operator=(input_buffer_adapter&) = delete; + input_buffer_adapter(input_buffer_adapter&&) = delete; + input_buffer_adapter& operator=(input_buffer_adapter&&) = delete; + ~input_buffer_adapter() override = default; std::char_traits::int_type get_character() noexcept override { @@ -2009,7 +2011,7 @@ struct wide_string_input_helper else { // get the current character - const int wc = static_cast(str[current_wchar++]); + const auto wc = static_cast(str[current_wchar++]); // UTF-32 to UTF-8 encoding if (wc < 0x80) @@ -2064,7 +2066,7 @@ struct wide_string_input_helper else { // get the current character - const int wc = static_cast(str[current_wchar++]); + const auto wc = static_cast(str[current_wchar++]); // UTF-16 to UTF-8 encoding if (wc < 0x80) @@ -2089,7 +2091,7 @@ struct wide_string_input_helper { if (current_wchar < str.size()) { - const int wc2 = static_cast(str[current_wchar++]); + const auto wc2 = static_cast(str[current_wchar++]); const int charcode = 0x10000 + (((wc & 0x3FF) << 10) | (wc2 & 0x3FF)); utf8_bytes[0] = 0xf0 | (charcode >> 18); utf8_bytes[1] = 0x80 | ((charcode >> 12) & 0x3F); @@ -2259,8 +2261,8 @@ class input_adapter /// the actual adapter input_adapter_t ia = nullptr; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -2371,7 +2373,10 @@ class lexer // delete because of pointer members lexer(const lexer&) = delete; + lexer(lexer&&) noexcept = default; lexer& operator=(lexer&) = delete; + lexer& operator=(lexer&&) noexcept = default; + ~lexer() = default; private: ///////////////////// @@ -3475,16 +3480,8 @@ scan_number_done: { if (get() == 0xEF) { - if (get() == 0xBB and get() == 0xBF) - { - // we completely parsed the BOM - return true; - } - else - { - // after reading 0xEF, an unexpected character followed - return false; - } + // check if we completely parse the BOM + return get() == 0xBB and get() == 0xBF; } else { @@ -3596,8 +3593,8 @@ scan_number_done: /// the decimal point const char decimal_point_char = '.'; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -3755,8 +3752,8 @@ struct is_sax_static_asserts "Missing/invalid function: bool parse_error(std::size_t, const " "std::string&, const exception&)"); }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -3946,7 +3943,7 @@ class json_sax_dom_parser return true; } - bool number_float(number_float_t val, const string_t&) + bool number_float(number_float_t val, const string_t& /*unused*/) { handle_value(val); return true; @@ -4003,7 +4000,7 @@ class json_sax_dom_parser return true; } - bool parse_error(std::size_t, const std::string&, + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& ex) { errored = true; @@ -4123,7 +4120,7 @@ class json_sax_dom_callback_parser return true; } - bool number_float(number_float_t val, const string_t&) + bool number_float(number_float_t val, const string_t& /*unused*/) { handle_value(val); return true; @@ -4261,7 +4258,7 @@ class json_sax_dom_callback_parser return true; } - bool parse_error(std::size_t, const std::string&, + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& ex) { errored = true; @@ -4407,37 +4404,37 @@ class json_sax_acceptor return true; } - bool boolean(bool) + bool boolean(bool /*unused*/) { return true; } - bool number_integer(number_integer_t) + bool number_integer(number_integer_t /*unused*/) { return true; } - bool number_unsigned(number_unsigned_t) + bool number_unsigned(number_unsigned_t /*unused*/) { return true; } - bool number_float(number_float_t, const string_t&) + bool number_float(number_float_t /*unused*/, const string_t& /*unused*/) { return true; } - bool string(string_t&) + bool string(string_t& /*unused*/) { return true; } - bool start_object(std::size_t = std::size_t(-1)) + bool start_object(std::size_t /*unused*/ = std::size_t(-1)) { return true; } - bool key(string_t&) + bool key(string_t& /*unused*/) { return true; } @@ -4447,7 +4444,7 @@ class json_sax_acceptor return true; } - bool start_array(std::size_t = std::size_t(-1)) + bool start_array(std::size_t /*unused*/ = std::size_t(-1)) { return true; } @@ -4457,14 +4454,14 @@ class json_sax_acceptor return true; } - bool parse_error(std::size_t, const std::string&, const detail::exception&) + bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/) { return false; } }; -} +} // namespace detail -} +} // namespace nlohmann // #include @@ -4940,8 +4937,8 @@ class parser /// whether to throw exceptions in case of errors const bool allow_exceptions = true; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -5062,8 +5059,8 @@ class primitive_iterator_t return *this; } }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -5090,8 +5087,8 @@ template struct internal_iterator /// generic iterator for all other types primitive_iterator_t primitive_iterator {}; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -5712,8 +5709,8 @@ class iter_impl /// the actual iterator of the associated instance internal_iterator::type> m_it; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -5835,8 +5832,8 @@ class json_reverse_iterator : public std::reverse_iterator return it.operator * (); } }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -5950,8 +5947,8 @@ class output_adapter private: output_adapter_t oa = nullptr; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -6365,8 +6362,8 @@ class binary_reader return false; } - const unsigned char byte1 = static_cast(byte1_raw); - const unsigned char byte2 = static_cast(byte2_raw); + const auto byte1 = static_cast(byte1_raw); + const auto byte2 = static_cast(byte2_raw); // code from RFC 7049, Appendix D, Figure 3: // As half-precision floating-point numbers were only added @@ -7001,6 +6998,7 @@ class binary_reader } if (len != std::size_t(-1)) + { for (std::size_t i = 0; i < len; ++i) { if (JSON_UNLIKELY(not parse_cbor_internal())) @@ -7008,6 +7006,7 @@ class binary_reader return false; } } + } else { while (get() != 0xFF) @@ -7658,8 +7657,8 @@ class binary_reader /// the SAX parser json_sax_t* sax = nullptr; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -8206,9 +8205,11 @@ class binary_writer case value_t::boolean: { if (add_prefix) + { oa->write_character(j.m_value.boolean ? static_cast('T') : static_cast('F')); + } break; } @@ -8574,32 +8575,32 @@ class binary_writer } } - static constexpr CharType get_cbor_float_prefix(float) + static constexpr CharType get_cbor_float_prefix(float /*unused*/) { return static_cast(0xFA); // Single-Precision Float } - static constexpr CharType get_cbor_float_prefix(double) + static constexpr CharType get_cbor_float_prefix(double /*unused*/) { return static_cast(0xFB); // Double-Precision Float } - static constexpr CharType get_msgpack_float_prefix(float) + static constexpr CharType get_msgpack_float_prefix(float /*unused*/) { return static_cast(0xCA); // float 32 } - static constexpr CharType get_msgpack_float_prefix(double) + static constexpr CharType get_msgpack_float_prefix(double /*unused*/) { return static_cast(0xCB); // float 64 } - static constexpr CharType get_ubjson_float_prefix(float) + static constexpr CharType get_ubjson_float_prefix(float /*unused*/) { return 'd'; // float 32 } - static constexpr CharType get_ubjson_float_prefix(double) + static constexpr CharType get_ubjson_float_prefix(double /*unused*/) { return 'D'; // float 64 } @@ -8611,8 +8612,8 @@ class binary_writer /// the output output_adapter_t oa = nullptr; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -8682,10 +8683,9 @@ struct diyfp // f * 2^e { static constexpr int kPrecision = 64; // = q - uint64_t f; - int e; + uint64_t f = 0; + int e = 0; - constexpr diyfp() noexcept : f(0), e(0) {} constexpr diyfp(uint64_t f_, int e_) noexcept : f(f_), e(e_) {} /*! @@ -8697,7 +8697,7 @@ struct diyfp // f * 2^e assert(x.e == y.e); assert(x.f >= y.f); - return diyfp(x.f - y.f, x.e); + return {x.f - y.f, x.e}; } /*! @@ -8762,7 +8762,7 @@ struct diyfp // f * 2^e const uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32); - return diyfp(h, x.e + y.e + 64); + return {h, x.e + y.e + 64}; } /*! @@ -8793,7 +8793,7 @@ struct diyfp // f * 2^e assert(delta >= 0); assert(((x.f << delta) >> delta) == x.f); - return diyfp(x.f << delta, target_exponent); + return {x.f << delta, target_exponent}; } }; @@ -9096,7 +9096,7 @@ inline cached_power get_cached_power_for_binary_exponent(int e) assert(e >= -1500); assert(e <= 1500); const int f = kAlpha - e - 1; - const int k = (f * 78913) / (1 << 18) + (f > 0); + const int k = (f * 78913) / (1 << 18) + static_cast(f > 0); const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep; assert(index >= 0); @@ -9244,7 +9244,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent, const diyfp one(uint64_t{1} << -M_plus.e, M_plus.e); - uint32_t p1 = static_cast(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.) + auto p1 = static_cast(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.) uint64_t p2 = M_plus.f & (one.f - 1); // p2 = f mod 2^-e // 1) @@ -9563,7 +9563,7 @@ inline char* append_exponent(char* buf, int e) *buf++ = '+'; } - uint32_t k = static_cast(e); + auto k = static_cast(e); if (k < 10) { // Always print at least two digits in the exponent. @@ -9681,7 +9681,7 @@ format. Returns an iterator pointing past-the-end of the decimal representation. @note The result is NOT null-terminated. */ template -char* to_chars(char* first, char* last, FloatType value) +char* to_chars(char* first, const char* last, FloatType value) { static_cast(last); // maybe unused - fix warning assert(std::isfinite(value)); @@ -9771,6 +9771,9 @@ class serializer // delete because of pointer members serializer(const serializer&) = delete; serializer& operator=(const serializer&) = delete; + serializer(serializer&&) noexcept = default; + serializer& operator=(serializer&&) noexcept = default; + ~serializer() = default; /*! @brief internal implementation of the serialization function @@ -10345,8 +10348,8 @@ class serializer /// the indentation string string_t indent_string; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -10382,9 +10385,11 @@ class json_ref {} // class should be movable only - json_ref(json_ref&&) = default; + json_ref(json_ref&&) noexcept = default; json_ref(const json_ref&) = delete; json_ref& operator=(const json_ref&) = delete; + json_ref& operator=(json_ref&&) noexcept = default; + ~json_ref() = default; value_type moved_or_copied() const { @@ -10410,8 +10415,8 @@ class json_ref value_type* value_ref = nullptr; const bool is_rvalue; }; -} -} +} // namespace detail +} // namespace nlohmann // #include @@ -11112,7 +11117,7 @@ class json_pointer /// the reference tokens std::vector reference_tokens; }; -} +} // namespace nlohmann // #include @@ -11165,7 +11170,7 @@ struct adl_serializer ::nlohmann::to_json(j, std::forward(val)); } }; -} +} // namespace nlohmann /*! @@ -12964,7 +12969,7 @@ class basic_json @since version 1.0.0 */ - reference& operator=(basic_json other) noexcept ( + basic_json& operator=(basic_json other) noexcept ( std::is_nothrow_move_constructible::value and std::is_nothrow_move_assignable::value and std::is_nothrow_move_constructible::value and From 3abb788139303f131681656d842fdb2aa92dd2f8 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 7 Oct 2018 19:07:58 +0200 Subject: [PATCH 27/77] :rotating_light: fixed some more clang-tidy warnings --- include/nlohmann/detail/input/json_sax.hpp | 73 +++++++------ include/nlohmann/detail/input/lexer.hpp | 12 +-- include/nlohmann/detail/input/parser.hpp | 7 +- .../nlohmann/detail/output/binary_writer.hpp | 24 ++--- include/nlohmann/json.hpp | 8 +- single_include/nlohmann/json.hpp | 100 ++++++++---------- 6 files changed, 102 insertions(+), 122 deletions(-) diff --git a/include/nlohmann/detail/input/json_sax.hpp b/include/nlohmann/detail/input/json_sax.hpp index 8cc18abc..ca2ce30a 100644 --- a/include/nlohmann/detail/input/json_sax.hpp +++ b/include/nlohmann/detail/input/json_sax.hpp @@ -286,20 +286,19 @@ class json_sax_dom_parser root = BasicJsonType(std::forward(v)); return &root; } + + assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); + + if (ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->emplace_back(std::forward(v)); + return &(ref_stack.back()->m_value.array->back()); + } else { - assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); - if (ref_stack.back()->is_array()) - { - ref_stack.back()->m_value.array->emplace_back(std::forward(v)); - return &(ref_stack.back()->m_value.array->back()); - } - else - { - assert(object_element); - *object_element = BasicJsonType(std::forward(v)); - return object_element; - } + assert(object_element); + *object_element = BasicJsonType(std::forward(v)); + return object_element; } } @@ -574,37 +573,37 @@ class json_sax_dom_callback_parser root = std::move(value); return {true, &root}; } + + // skip this value if we already decided to skip the parent + // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) + if (not ref_stack.back()) + { + return {false, nullptr}; + } + + // we now only expect arrays and objects + assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); + + if (ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->push_back(std::move(value)); + return {true, &(ref_stack.back()->m_value.array->back())}; + } else { - // skip this value if we already decided to skip the parent - // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) - if (not ref_stack.back()) + // check if we should store an element for the current key + assert(not key_keep_stack.empty()); + const bool store_element = key_keep_stack.back(); + key_keep_stack.pop_back(); + + if (not store_element) { return {false, nullptr}; } - assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); - if (ref_stack.back()->is_array()) - { - ref_stack.back()->m_value.array->push_back(std::move(value)); - return {true, &(ref_stack.back()->m_value.array->back())}; - } - else - { - // check if we should store an element for the current key - assert(not key_keep_stack.empty()); - const bool store_element = key_keep_stack.back(); - key_keep_stack.pop_back(); - - if (not store_element) - { - return {false, nullptr}; - } - - assert(object_element); - *object_element = std::move(value); - return {true, object_element}; - } + assert(object_element); + *object_element = std::move(value); + return {true, object_element}; } } diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 4470e932..4204ab24 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -1214,13 +1214,11 @@ scan_number_done: // check if we completely parse the BOM return get() == 0xBB and get() == 0xBF; } - else - { - // the first character is not the beginning of the BOM; unget it to - // process is later - unget(); - return true; - } + + // the first character is not the beginning of the BOM; unget it to + // process is later + unget(); + return true; } token_type scan() diff --git a/include/nlohmann/detail/input/parser.hpp b/include/nlohmann/detail/input/parser.hpp index 1ee1e6bf..c354a7b5 100644 --- a/include/nlohmann/detail/input/parser.hpp +++ b/include/nlohmann/detail/input/parser.hpp @@ -201,12 +201,9 @@ class parser m_lexer.get_token_string(), parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string))); } - else + if (JSON_UNLIKELY(not sax->key(m_lexer.get_string()))) { - if (JSON_UNLIKELY(not sax->key(m_lexer.get_string()))) - { - return false; - } + return false; } // parse separator (:) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 17df41d8..b93dc6a3 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -851,22 +851,20 @@ class binary_writer { return 'i'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'U'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'I'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'l'; } - else // no check and assume int64_t (see note above) - { - return 'L'; - } + // no check and assume int64_t (see note above) + return 'L'; } case value_t::number_unsigned: @@ -875,22 +873,20 @@ class binary_writer { return 'i'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'U'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'I'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'l'; } - else // no check and assume int64_t (see note above) - { - return 'L'; - } + // no check and assume int64_t (see note above) + return 'L'; } case value_t::number_float: diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 0b6a6fb5..f58cef14 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -7289,11 +7289,9 @@ class basic_json // avoid undefined behavior JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range")); } - else - { - // default case: insert add offset - parent.insert(parent.begin() + static_cast(idx), val); - } + + // default case: insert add offset + parent.insert(parent.begin() + static_cast(idx), val); } break; } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 210fc88c..7abcb127 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -3483,13 +3483,11 @@ scan_number_done: // check if we completely parse the BOM return get() == 0xBB and get() == 0xBF; } - else - { - // the first character is not the beginning of the BOM; unget it to - // process is later - unget(); - return true; - } + + // the first character is not the beginning of the BOM; unget it to + // process is later + unget(); + return true; } token_type scan() @@ -4048,20 +4046,19 @@ class json_sax_dom_parser root = BasicJsonType(std::forward(v)); return &root; } + + assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); + + if (ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->emplace_back(std::forward(v)); + return &(ref_stack.back()->m_value.array->back()); + } else { - assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); - if (ref_stack.back()->is_array()) - { - ref_stack.back()->m_value.array->emplace_back(std::forward(v)); - return &(ref_stack.back()->m_value.array->back()); - } - else - { - assert(object_element); - *object_element = BasicJsonType(std::forward(v)); - return object_element; - } + assert(object_element); + *object_element = BasicJsonType(std::forward(v)); + return object_element; } } @@ -4336,37 +4333,37 @@ class json_sax_dom_callback_parser root = std::move(value); return {true, &root}; } + + // skip this value if we already decided to skip the parent + // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) + if (not ref_stack.back()) + { + return {false, nullptr}; + } + + // we now only expect arrays and objects + assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); + + if (ref_stack.back()->is_array()) + { + ref_stack.back()->m_value.array->push_back(std::move(value)); + return {true, &(ref_stack.back()->m_value.array->back())}; + } else { - // skip this value if we already decided to skip the parent - // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) - if (not ref_stack.back()) + // check if we should store an element for the current key + assert(not key_keep_stack.empty()); + const bool store_element = key_keep_stack.back(); + key_keep_stack.pop_back(); + + if (not store_element) { return {false, nullptr}; } - assert(ref_stack.back()->is_array() or ref_stack.back()->is_object()); - if (ref_stack.back()->is_array()) - { - ref_stack.back()->m_value.array->push_back(std::move(value)); - return {true, &(ref_stack.back()->m_value.array->back())}; - } - else - { - // check if we should store an element for the current key - assert(not key_keep_stack.empty()); - const bool store_element = key_keep_stack.back(); - key_keep_stack.pop_back(); - - if (not store_element) - { - return {false, nullptr}; - } - - assert(object_element); - *object_element = std::move(value); - return {true, object_element}; - } + assert(object_element); + *object_element = std::move(value); + return {true, object_element}; } } @@ -4654,12 +4651,9 @@ class parser m_lexer.get_token_string(), parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string))); } - else + if (JSON_UNLIKELY(not sax->key(m_lexer.get_string()))) { - if (JSON_UNLIKELY(not sax->key(m_lexer.get_string()))) - { - return false; - } + return false; } // parse separator (:) @@ -18392,11 +18386,9 @@ class basic_json // avoid undefined behavior JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range")); } - else - { - // default case: insert add offset - parent.insert(parent.begin() + static_cast(idx), val); - } + + // default case: insert add offset + parent.insert(parent.begin() + static_cast(idx), val); } break; } From df0f612d1b32f04a191078db75c8f3deb4655cdb Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Sun, 7 Oct 2018 20:08:05 +0200 Subject: [PATCH 28/77] BSON: allow and discard values and object entries of type `value_t::discarded` --- .../nlohmann/detail/output/binary_writer.hpp | 5 +++- single_include/nlohmann/json.hpp | 5 +++- test/src/unit-bson.cpp | 25 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index bce5116d..0ec237ea 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -9,7 +9,6 @@ #include #include - namespace nlohmann { namespace detail @@ -864,6 +863,8 @@ class binary_writer assert(false); return 0ul; // LCOV_EXCL_STOP + case value_t::discarded: + return 0ul; case value_t::object: return header_size + calc_bson_object_size(*j.m_value.object); case value_t::array: @@ -898,6 +899,8 @@ class binary_writer assert(false); return; // LCOV_EXCL_STOP + case value_t::discarded: + return; case value_t::object: return write_bson_object_entry(name, *j.m_value.object); case value_t::array: diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 48b17d17..98c6b1f1 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -7853,7 +7853,6 @@ class binary_reader // #include - namespace nlohmann { namespace detail @@ -8708,6 +8707,8 @@ class binary_writer assert(false); return 0ul; // LCOV_EXCL_STOP + case value_t::discarded: + return 0ul; case value_t::object: return header_size + calc_bson_object_size(*j.m_value.object); case value_t::array: @@ -8742,6 +8743,8 @@ class binary_writer assert(false); return; // LCOV_EXCL_STOP + case value_t::discarded: + return; case value_t::object: return write_bson_object_entry(name, *j.m_value.object); case value_t::array: diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 33ef25c4..4a1b387e 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -376,6 +376,31 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } + SECTION("discarded values are not serialized") + { + json j = json::value_t::discarded; + const auto result = json::to_bson(j); + CHECK(result.empty()); + } + + SECTION("discarded members are not serialized") + { + json j = + { + { "entry", json::value_t::discarded } + }; + + std::vector expected = + { + 0x05, 0x00, 0x00, 0x00, // size (little endian) + // no entries + 0x00 // end marker + }; + + const auto result = json::to_bson(j); + CHECK(result == expected); + } + SECTION("non-empty object with object member") { From f8158997b5430d002b8bd3ae493a630a1b822145 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 7 Oct 2018 21:30:58 +0200 Subject: [PATCH 29/77] :memo: fixed documentation --- doc/examples/json_pointer.output | 2 +- doc/examples/parse_error.output | 2 +- include/nlohmann/detail/input/json_sax.hpp | 2 +- include/nlohmann/json.hpp | 33 ++++++++++---------- single_include/nlohmann/json.hpp | 35 +++++++++++----------- 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/doc/examples/json_pointer.output b/doc/examples/json_pointer.output index 33e2cc68..9e027d6d 100644 --- a/doc/examples/json_pointer.output +++ b/doc/examples/json_pointer.output @@ -1,3 +1,3 @@ -[json.exception.parse_error.107] parse error at 1: JSON pointer must be empty or begin with '/' - was: 'foo' +[json.exception.parse_error.107] parse error at byte 1: JSON pointer must be empty or begin with '/' - was: 'foo' [json.exception.parse_error.108] parse error: escape character '~' must be followed with '0' or '1' [json.exception.parse_error.108] parse error: escape character '~' must be followed with '0' or '1' diff --git a/doc/examples/parse_error.output b/doc/examples/parse_error.output index 96ab5bb5..7ceb2e80 100644 --- a/doc/examples/parse_error.output +++ b/doc/examples/parse_error.output @@ -1,3 +1,3 @@ -message: [json.exception.parse_error.101] parse error at 8: syntax error - unexpected ']'; expected '[', '{', or a literal +message: [json.exception.parse_error.101] parse error at line 1, column 8: syntax error - unexpected ']'; expected '[', '{', or a literal exception id: 101 byte position of error: 8 diff --git a/include/nlohmann/detail/input/json_sax.hpp b/include/nlohmann/detail/input/json_sax.hpp index 1705a861..198ba70b 100644 --- a/include/nlohmann/detail/input/json_sax.hpp +++ b/include/nlohmann/detail/input/json_sax.hpp @@ -113,7 +113,7 @@ struct json_sax @brief a parse error occurred @param[in] position the position in the input where the error occurs @param[in] last_token the last read token - @param[in] error_msg a detailed error message + @param[in] ex an exception object describing the error @return whether parsing should proceed (must return false) */ virtual bool parse_error(std::size_t position, diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 52c301cf..0711beba 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -5999,6 +5999,8 @@ class basic_json @param[in] cb a parser callback function of type @ref parser_callback_t which is used to control the deserialization by filtering unwanted values (optional) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) @return result of the deserialization @@ -6394,7 +6396,7 @@ class basic_json vector in CBOR format.,to_cbor} @sa http://cbor.io - @sa @ref from_cbor(detail::input_adapter, const bool strict) for the + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the analogous deserialization @sa @ref to_msgpack(const basic_json&) for the related MessagePack format @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the @@ -6491,8 +6493,7 @@ class basic_json vector in MessagePack format.,to_msgpack} @sa http://msgpack.org - @sa @ref from_msgpack(const std::vector&, const size_t) for the - analogous deserialization + @sa @ref from_msgpack for the analogous deserialization @sa @ref to_cbor(const basic_json& for the related CBOR format @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the related UBJSON format @@ -6589,7 +6590,7 @@ class basic_json vector in UBJSON format.,to_ubjson} @sa http://ubjson.org - @sa @ref from_ubjson(detail::input_adapter, const bool strict) for the + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the analogous deserialization @sa @ref to_cbor(const basic_json& for the related CBOR format @sa @ref to_msgpack(const basic_json&) for the related MessagePack format @@ -6704,14 +6705,14 @@ class basic_json @sa http://cbor.io @sa @ref to_cbor(const basic_json&) for the analogous serialization - @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for the + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the related MessagePack format - @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the related UBJSON format @since version 2.0.9; parameter @a start_index since 2.1.1; changed to consume input adapters, removed start_index parameter, and added - @a strict parameter since 3.0.0; added @allow_exceptions parameter + @a strict parameter since 3.0.0; added @a allow_exceptions parameter since 3.2.0 */ static basic_json from_cbor(detail::input_adapter&& i, @@ -6725,7 +6726,7 @@ class basic_json } /*! - @copydoc from_cbor(detail::input_adapter, const bool, const bool) + @copydoc from_cbor(detail::input_adapter&&, const bool, const bool) */ template::value, int> = 0> @@ -6807,14 +6808,14 @@ class basic_json @sa http://msgpack.org @sa @ref to_msgpack(const basic_json&) for the analogous serialization - @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the related CBOR format - @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the related UBJSON format @since version 2.0.9; parameter @a start_index since 2.1.1; changed to consume input adapters, removed start_index parameter, and added - @a strict parameter since 3.0.0; added @allow_exceptions parameter + @a strict parameter since 3.0.0; added @a allow_exceptions parameter since 3.2.0 */ static basic_json from_msgpack(detail::input_adapter&& i, @@ -6828,7 +6829,7 @@ class basic_json } /*! - @copydoc from_msgpack(detail::input_adapter, const bool, const bool) + @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool) */ template::value, int> = 0> @@ -6892,12 +6893,12 @@ class basic_json @sa http://ubjson.org @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the analogous serialization - @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the related CBOR format - @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the related MessagePack format - @since version 3.1.0; added @allow_exceptions parameter since 3.2.0 + @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0 */ static basic_json from_ubjson(detail::input_adapter&& i, const bool strict = true, @@ -6910,7 +6911,7 @@ class basic_json } /*! - @copydoc from_ubjson(detail::input_adapter, const bool, const bool) + @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool) */ template::value, int> = 0> diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index e551784a..e4b9a0c8 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -4103,7 +4103,7 @@ struct json_sax @brief a parse error occurred @param[in] position the position in the input where the error occurs @param[in] last_token the last read token - @param[in] error_msg a detailed error message + @param[in] ex an exception object describing the error @return whether parsing should proceed (must return false) */ virtual bool parse_error(std::size_t position, @@ -17319,6 +17319,8 @@ class basic_json @param[in] cb a parser callback function of type @ref parser_callback_t which is used to control the deserialization by filtering unwanted values (optional) + @param[in] allow_exceptions whether to throw exceptions in case of a + parse error (optional, true by default) @return result of the deserialization @@ -17714,7 +17716,7 @@ class basic_json vector in CBOR format.,to_cbor} @sa http://cbor.io - @sa @ref from_cbor(detail::input_adapter, const bool strict) for the + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the analogous deserialization @sa @ref to_msgpack(const basic_json&) for the related MessagePack format @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the @@ -17811,8 +17813,7 @@ class basic_json vector in MessagePack format.,to_msgpack} @sa http://msgpack.org - @sa @ref from_msgpack(const std::vector&, const size_t) for the - analogous deserialization + @sa @ref from_msgpack for the analogous deserialization @sa @ref to_cbor(const basic_json& for the related CBOR format @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the related UBJSON format @@ -17909,7 +17910,7 @@ class basic_json vector in UBJSON format.,to_ubjson} @sa http://ubjson.org - @sa @ref from_ubjson(detail::input_adapter, const bool strict) for the + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the analogous deserialization @sa @ref to_cbor(const basic_json& for the related CBOR format @sa @ref to_msgpack(const basic_json&) for the related MessagePack format @@ -18024,14 +18025,14 @@ class basic_json @sa http://cbor.io @sa @ref to_cbor(const basic_json&) for the analogous serialization - @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for the + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the related MessagePack format - @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the related UBJSON format @since version 2.0.9; parameter @a start_index since 2.1.1; changed to consume input adapters, removed start_index parameter, and added - @a strict parameter since 3.0.0; added @allow_exceptions parameter + @a strict parameter since 3.0.0; added @a allow_exceptions parameter since 3.2.0 */ static basic_json from_cbor(detail::input_adapter&& i, @@ -18045,7 +18046,7 @@ class basic_json } /*! - @copydoc from_cbor(detail::input_adapter, const bool, const bool) + @copydoc from_cbor(detail::input_adapter&&, const bool, const bool) */ template::value, int> = 0> @@ -18127,14 +18128,14 @@ class basic_json @sa http://msgpack.org @sa @ref to_msgpack(const basic_json&) for the analogous serialization - @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the related CBOR format - @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the related UBJSON format @since version 2.0.9; parameter @a start_index since 2.1.1; changed to consume input adapters, removed start_index parameter, and added - @a strict parameter since 3.0.0; added @allow_exceptions parameter + @a strict parameter since 3.0.0; added @a allow_exceptions parameter since 3.2.0 */ static basic_json from_msgpack(detail::input_adapter&& i, @@ -18148,7 +18149,7 @@ class basic_json } /*! - @copydoc from_msgpack(detail::input_adapter, const bool, const bool) + @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool) */ template::value, int> = 0> @@ -18212,12 +18213,12 @@ class basic_json @sa http://ubjson.org @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the analogous serialization - @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the related CBOR format - @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the related MessagePack format - @since version 3.1.0; added @allow_exceptions parameter since 3.2.0 + @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0 */ static basic_json from_ubjson(detail::input_adapter&& i, const bool strict = true, @@ -18230,7 +18231,7 @@ class basic_json } /*! - @copydoc from_ubjson(detail::input_adapter, const bool, const bool) + @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool) */ template::value, int> = 0> From 6e49d9f5ffb1f07b813e7ff1bad0ca80265a4a49 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 7 Oct 2018 21:34:40 +0200 Subject: [PATCH 30/77] :ambulance: fixed compilation error --- include/nlohmann/detail/input/lexer.hpp | 4 +-- include/nlohmann/detail/output/serializer.hpp | 4 +-- single_include/nlohmann/json.hpp | 32 ++++++++----------- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 4204ab24..362b4f23 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -104,9 +104,9 @@ class lexer // delete because of pointer members lexer(const lexer&) = delete; - lexer(lexer&&) noexcept = default; + lexer(lexer&&) = delete; lexer& operator=(lexer&) = delete; - lexer& operator=(lexer&&) noexcept = default; + lexer& operator=(lexer&&) = delete; ~lexer() = default; private: diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 6088ebe8..bb74a86e 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -53,8 +53,8 @@ class serializer // delete because of pointer members serializer(const serializer&) = delete; serializer& operator=(const serializer&) = delete; - serializer(serializer&&) noexcept = default; - serializer& operator=(serializer&&) noexcept = default; + serializer(serializer&&) = delete; + serializer& operator=(serializer&&) = delete; ~serializer() = default; /*! diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 7abcb127..583eb874 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -2373,9 +2373,9 @@ class lexer // delete because of pointer members lexer(const lexer&) = delete; - lexer(lexer&&) noexcept = default; + lexer(lexer&&) = delete; lexer& operator=(lexer&) = delete; - lexer& operator=(lexer&&) noexcept = default; + lexer& operator=(lexer&&) = delete; ~lexer() = default; private: @@ -8510,22 +8510,20 @@ class binary_writer { return 'i'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'U'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'I'; } - else if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) + if ((std::numeric_limits::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits::max)()) { return 'l'; } - else // no check and assume int64_t (see note above) - { - return 'L'; - } + // no check and assume int64_t (see note above) + return 'L'; } case value_t::number_unsigned: @@ -8534,22 +8532,20 @@ class binary_writer { return 'i'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'U'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'I'; } - else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) + if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { return 'l'; } - else // no check and assume int64_t (see note above) - { - return 'L'; - } + // no check and assume int64_t (see note above) + return 'L'; } case value_t::number_float: @@ -9765,8 +9761,8 @@ class serializer // delete because of pointer members serializer(const serializer&) = delete; serializer& operator=(const serializer&) = delete; - serializer(serializer&&) noexcept = default; - serializer& operator=(serializer&&) noexcept = default; + serializer(serializer&&) = delete; + serializer& operator=(serializer&&) = delete; ~serializer() = default; /*! From 74a31075e38f1829c99ec292f31be06ea650a4e2 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 7 Oct 2018 22:39:17 +0200 Subject: [PATCH 31/77] :wheelchair: improved parse error messages --- doc/examples/parse_error.output | 2 +- include/nlohmann/detail/input/parser.hpp | 45 +++-- single_include/nlohmann/json.hpp | 45 +++-- test/src/unit-class_parser.cpp | 234 +++++++++++------------ test/src/unit-deserialization.cpp | 24 +-- test/src/unit-regression.cpp | 20 +- test/src/unit-unicode.cpp | 14 +- 7 files changed, 211 insertions(+), 173 deletions(-) diff --git a/doc/examples/parse_error.output b/doc/examples/parse_error.output index 7ceb2e80..fe366ff8 100644 --- a/doc/examples/parse_error.output +++ b/doc/examples/parse_error.output @@ -1,3 +1,3 @@ -message: [json.exception.parse_error.101] parse error at line 1, column 8: syntax error - unexpected ']'; expected '[', '{', or a literal +message: [json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - unexpected ']'; expected '[', '{', or a literal exception id: 101 byte position of error: 8 diff --git a/include/nlohmann/detail/input/parser.hpp b/include/nlohmann/detail/input/parser.hpp index 70d92a26..c1ea3d7e 100644 --- a/include/nlohmann/detail/input/parser.hpp +++ b/include/nlohmann/detail/input/parser.hpp @@ -91,7 +91,8 @@ class parser { sdp.parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); } // in case of an error, return discarded value @@ -119,7 +120,8 @@ class parser { sdp.parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); } // in case of an error, return discarded value @@ -154,7 +156,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); } return result; @@ -199,7 +202,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::value_string, "object key"))); } else { @@ -214,7 +218,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::name_separator, "object separator"))); } // remember we are now inside an object @@ -328,14 +333,16 @@ class parser // using "uninitialized" to avoid "expected" message return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::uninitialized, "value"))); } default: // the last token was unexpected { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::literal_or_value, "value"))); } } } @@ -383,7 +390,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_array, "array"))); } } else // object @@ -396,7 +404,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::value_string, "object key"))); } else { @@ -411,7 +420,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::name_separator, "object separator"))); } // parse values @@ -440,7 +450,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_object, "object"))); } } } @@ -453,9 +464,17 @@ class parser return (last_token = m_lexer.scan()); } - std::string exception_message(const token_type expected) + std::string exception_message(const token_type expected, const std::string& context) { - std::string error_msg = "syntax error - "; + std::string error_msg = "syntax error "; + + if (not context.empty()) + { + error_msg += "while parsing " + context + " "; + } + + error_msg += "- "; + if (last_token == token_type::parse_error) { error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" + diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index e4b9a0c8..1761079e 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -4772,7 +4772,8 @@ class parser { sdp.parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); } // in case of an error, return discarded value @@ -4800,7 +4801,8 @@ class parser { sdp.parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); } // in case of an error, return discarded value @@ -4835,7 +4837,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_of_input, "value"))); } return result; @@ -4880,7 +4883,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::value_string, "object key"))); } else { @@ -4895,7 +4899,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::name_separator, "object separator"))); } // remember we are now inside an object @@ -5009,14 +5014,16 @@ class parser // using "uninitialized" to avoid "expected" message return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::uninitialized, "value"))); } default: // the last token was unexpected { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::literal_or_value, "value"))); } } } @@ -5064,7 +5071,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_array, "array"))); } } else // object @@ -5077,7 +5085,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::value_string, "object key"))); } else { @@ -5092,7 +5101,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::name_separator, "object separator"))); } // parse values @@ -5121,7 +5131,8 @@ class parser { return sax->parse_error(m_lexer.get_position(), m_lexer.get_token_string(), - parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object))); + parse_error::create(101, m_lexer.get_position(), + exception_message(token_type::end_object, "object"))); } } } @@ -5134,9 +5145,17 @@ class parser return (last_token = m_lexer.scan()); } - std::string exception_message(const token_type expected) + std::string exception_message(const token_type expected, const std::string& context) { - std::string error_msg = "syntax error - "; + std::string error_msg = "syntax error "; + + if (not context.empty()) + { + error_msg += "while parsing " + context + " "; + } + + error_msg += "- "; + if (last_token == token_type::parse_error) { error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" + diff --git a/test/src/unit-class_parser.cpp b/test/src/unit-class_parser.cpp index 8dac4a44..8d0b68d2 100644 --- a/test/src/unit-class_parser.cpp +++ b/test/src/unit-class_parser.cpp @@ -313,18 +313,18 @@ TEST_CASE("parser class") // error: tab in string CHECK_THROWS_AS(parser_helper("\"\t\""), json::parse_error&); CHECK_THROWS_WITH(parser_helper("\"\t\""), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"'"); // error: newline in string CHECK_THROWS_AS(parser_helper("\"\n\""), json::parse_error&); CHECK_THROWS_AS(parser_helper("\"\r\""), json::parse_error&); CHECK_THROWS_WITH(parser_helper("\"\n\""), - "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error while parsing value - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"'"); CHECK_THROWS_WITH(parser_helper("\"\r\""), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"'"); // error: backspace in string CHECK_THROWS_AS(parser_helper("\"\b\""), json::parse_error&); CHECK_THROWS_WITH(parser_helper("\"\b\""), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"'"); // improve code coverage CHECK_THROWS_AS(parser_helper("\uFF01"), json::parse_error&); CHECK_THROWS_AS(parser_helper("[-4:1,]"), json::parse_error&); @@ -361,38 +361,38 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("\"\x1d\""), json::parse_error&); CHECK_THROWS_AS(parser_helper("\"\x1e\""), json::parse_error&); CHECK_THROWS_AS(parser_helper("\"\x1f\""), json::parse_error&); - CHECK_THROWS_WITH(parser_helper("\"\x00\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: missing closing quote; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x01\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0001 (SOH) must be escaped to \\u0001; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x02\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0002 (STX) must be escaped to \\u0002; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x03\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0003 (ETX) must be escaped to \\u0003; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x04\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0004 (EOT) must be escaped to \\u0004; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x05\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0005 (ENQ) must be escaped to \\u0005; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x06\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0006 (ACK) must be escaped to \\u0006; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x07\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0007 (BEL) must be escaped to \\u0007; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x08\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x09\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0a\""), "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000B (VT) must be escaped to \\u000B; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000E (SO) must be escaped to \\u000E; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x0f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+000F (SI) must be escaped to \\u000F; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x10\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0010 (DLE) must be escaped to \\u0010; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x11\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0011 (DC1) must be escaped to \\u0011; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x12\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0012 (DC2) must be escaped to \\u0012; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x13\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0013 (DC3) must be escaped to \\u0013; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x14\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0014 (DC4) must be escaped to \\u0014; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x15\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0015 (NAK) must be escaped to \\u0015; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x16\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0016 (SYN) must be escaped to \\u0016; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x17\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0017 (ETB) must be escaped to \\u0017; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x18\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0018 (CAN) must be escaped to \\u0018; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x19\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0019 (EM) must be escaped to \\u0019; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1a\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001A (SUB) must be escaped to \\u001A; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001B (ESC) must be escaped to \\u001B; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001C (FS) must be escaped to \\u001C; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001D (GS) must be escaped to \\u001D; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001E (RS) must be escaped to \\u001E; last read: '\"'"); - CHECK_THROWS_WITH(parser_helper("\"\x1f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+001F (US) must be escaped to \\u001F; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x00\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: missing closing quote; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x01\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0001 (SOH) must be escaped to \\u0001; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x02\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0002 (STX) must be escaped to \\u0002; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x03\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0003 (ETX) must be escaped to \\u0003; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x04\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0004 (EOT) must be escaped to \\u0004; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x05\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0005 (ENQ) must be escaped to \\u0005; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x06\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0006 (ACK) must be escaped to \\u0006; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x07\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0007 (BEL) must be escaped to \\u0007; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x08\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x09\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0a\""), "[json.exception.parse_error.101] parse error at line 2, column 0: syntax error while parsing value - invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000B (VT) must be escaped to \\u000B; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000E (SO) must be escaped to \\u000E; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x0f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+000F (SI) must be escaped to \\u000F; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x10\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0010 (DLE) must be escaped to \\u0010; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x11\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0011 (DC1) must be escaped to \\u0011; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x12\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0012 (DC2) must be escaped to \\u0012; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x13\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0013 (DC3) must be escaped to \\u0013; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x14\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0014 (DC4) must be escaped to \\u0014; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x15\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0015 (NAK) must be escaped to \\u0015; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x16\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0016 (SYN) must be escaped to \\u0016; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x17\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0017 (ETB) must be escaped to \\u0017; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x18\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0018 (CAN) must be escaped to \\u0018; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x19\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0019 (EM) must be escaped to \\u0019; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1a\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001A (SUB) must be escaped to \\u001A; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1b\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001B (ESC) must be escaped to \\u001B; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1c\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001C (FS) must be escaped to \\u001C; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1d\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001D (GS) must be escaped to \\u001D; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1e\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001E (RS) must be escaped to \\u001E; last read: '\"'"); + CHECK_THROWS_WITH(parser_helper("\"\x1f\""), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+001F (US) must be escaped to \\u001F; last read: '\"'"); SECTION("additional test for null byte") { @@ -403,7 +403,7 @@ TEST_CASE("parser class") std::string s = "\"1\""; s[1] = '\0'; CHECK_THROWS_AS(json::parse(s.begin(), s.end()), json::parse_error&); - CHECK_THROWS_WITH(json::parse(s.begin(), s.end()), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: control character U+0000 (NUL) must be escaped to \\u0000; last read: '\"'"); + CHECK_THROWS_WITH(json::parse(s.begin(), s.end()), "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: control character U+0000 (NUL) must be escaped to \\u0000; last read: '\"'"); } } @@ -603,39 +603,39 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("+0"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("01"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - unexpected number literal; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - unexpected number literal; expected end of input"); CHECK_THROWS_WITH(parser_helper("-01"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - unexpected number literal; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - unexpected number literal; expected end of input"); CHECK_THROWS_WITH(parser_helper("--1"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '--'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '--'"); CHECK_THROWS_WITH(parser_helper("1."), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected digit after '.'; last read: '1.'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '1.'"); CHECK_THROWS_WITH(parser_helper("1E"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E'"); CHECK_THROWS_WITH(parser_helper("1E-"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid number; expected digit after exponent sign; last read: '1E-'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '1E-'"); CHECK_THROWS_WITH(parser_helper("1.E1"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected digit after '.'; last read: '1.E'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '1.E'"); CHECK_THROWS_WITH(parser_helper("-1E"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '-1E'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '-1E'"); CHECK_THROWS_WITH(parser_helper("-0E#"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '-0E#'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '-0E#'"); CHECK_THROWS_WITH(parser_helper("-0E-#"), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid number; expected digit after exponent sign; last read: '-0E-#'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '-0E-#'"); CHECK_THROWS_WITH(parser_helper("-0#"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid literal; last read: '-0#'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: '-0#'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0.0:"), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - unexpected ':'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - unexpected ':'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0.0Z"), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid literal; last read: '-0.0Z'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: '-0.0Z'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0E123:"), - "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - unexpected ':'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - unexpected ':'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0e0-:"), - "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error - invalid number; expected digit after '-'; last read: '-:'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-:'; expected end of input"); CHECK_THROWS_WITH(parser_helper("-0e-:"), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid number; expected digit after exponent sign; last read: '-0e-:'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid number; expected digit after exponent sign; last read: '-0e-:'"); CHECK_THROWS_WITH(parser_helper("-0f"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: '-0f'; expected end of input"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: '-0f'; expected end of input"); } } } @@ -920,33 +920,33 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("1E/"), json::parse_error&); CHECK_THROWS_AS(parser_helper("1E:"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("0."), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected digit after '.'; last read: '0.'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '0.'"); CHECK_THROWS_WITH(parser_helper("-"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '-'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-'"); CHECK_THROWS_WITH(parser_helper("--"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '--'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '--'"); CHECK_THROWS_WITH(parser_helper("-0."), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid number; expected digit after '.'; last read: '-0.'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid number; expected digit after '.'; last read: '-0.'"); CHECK_THROWS_WITH(parser_helper("-."), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '-.'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-.'"); CHECK_THROWS_WITH(parser_helper("-:"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid number; expected digit after '-'; last read: '-:'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid number; expected digit after '-'; last read: '-:'"); CHECK_THROWS_WITH(parser_helper("0.:"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected digit after '.'; last read: '0.:'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected digit after '.'; last read: '0.:'"); CHECK_THROWS_WITH(parser_helper("e."), - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - invalid literal; last read: 'e'"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - invalid literal; last read: 'e'"); CHECK_THROWS_WITH(parser_helper("1e."), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e.'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e.'"); CHECK_THROWS_WITH(parser_helper("1e/"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e/'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e/'"); CHECK_THROWS_WITH(parser_helper("1e:"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1e:'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1e:'"); CHECK_THROWS_WITH(parser_helper("1E."), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E.'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E.'"); CHECK_THROWS_WITH(parser_helper("1E/"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E/'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E/'"); CHECK_THROWS_WITH(parser_helper("1E:"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid number; expected '+', '-', or digit after exponent; last read: '1E:'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid number; expected '+', '-', or digit after exponent; last read: '1E:'"); // unexpected end of null CHECK_THROWS_AS(parser_helper("n"), json::parse_error&); @@ -955,15 +955,15 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("nulk"), json::parse_error&); CHECK_THROWS_AS(parser_helper("nulm"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("n"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid literal; last read: 'n'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 'n'"); CHECK_THROWS_WITH(parser_helper("nu"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid literal; last read: 'nu'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'nu'"); CHECK_THROWS_WITH(parser_helper("nul"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'nul'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nul'"); CHECK_THROWS_WITH(parser_helper("nulk"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'nulk'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nulk'"); CHECK_THROWS_WITH(parser_helper("nulm"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'nulm'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'nulm'"); // unexpected end of true CHECK_THROWS_AS(parser_helper("t"), json::parse_error&); @@ -972,15 +972,15 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("trud"), json::parse_error&); CHECK_THROWS_AS(parser_helper("truf"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("t"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid literal; last read: 't'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 't'"); CHECK_THROWS_WITH(parser_helper("tr"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid literal; last read: 'tr'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'tr'"); CHECK_THROWS_WITH(parser_helper("tru"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'tru'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'tru'"); CHECK_THROWS_WITH(parser_helper("trud"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'trud'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'trud'"); CHECK_THROWS_WITH(parser_helper("truf"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'truf'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'truf'"); // unexpected end of false CHECK_THROWS_AS(parser_helper("f"), json::parse_error&); @@ -990,17 +990,17 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("falsd"), json::parse_error&); CHECK_THROWS_AS(parser_helper("falsf"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("f"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid literal; last read: 'f'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid literal; last read: 'f'"); CHECK_THROWS_WITH(parser_helper("fa"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid literal; last read: 'fa'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid literal; last read: 'fa'"); CHECK_THROWS_WITH(parser_helper("fal"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid literal; last read: 'fal'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid literal; last read: 'fal'"); CHECK_THROWS_WITH(parser_helper("fals"), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid literal; last read: 'fals'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'fals'"); CHECK_THROWS_WITH(parser_helper("falsd"), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid literal; last read: 'falsd'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'falsd'"); CHECK_THROWS_WITH(parser_helper("falsf"), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid literal; last read: 'falsf'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid literal; last read: 'falsf'"); // missing/unexpected end of array CHECK_THROWS_AS(parser_helper("["), json::parse_error&); @@ -1009,15 +1009,15 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("[1,]"), json::parse_error&); CHECK_THROWS_AS(parser_helper("]"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("["), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("[1"), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing array - unexpected end of input; expected ']'"); CHECK_THROWS_WITH(parser_helper("[1,"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("[1,]"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - unexpected ']'; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected ']'; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("]"), - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected ']'; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected ']'; expected '[', '{', or a literal"); // missing/unexpected end of object CHECK_THROWS_AS(parser_helper("{"), json::parse_error&); @@ -1027,17 +1027,17 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("{\"foo\":1,}"), json::parse_error&); CHECK_THROWS_AS(parser_helper("}"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("{"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - unexpected end of input; expected string literal"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing object key - unexpected end of input; expected string literal"); CHECK_THROWS_WITH(parser_helper("{\"foo\""), - "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - unexpected end of input; expected ':'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing object separator - unexpected end of input; expected ':'"); CHECK_THROWS_WITH(parser_helper("{\"foo\":"), - "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("{\"foo\":}"), - "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error - unexpected '}'; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - unexpected '}'; expected '[', '{', or a literal"); CHECK_THROWS_WITH(parser_helper("{\"foo\":1,}"), - "[json.exception.parse_error.101] parse error at line 1, column 10: syntax error - unexpected '}'; expected string literal"); + "[json.exception.parse_error.101] parse error at line 1, column 10: syntax error while parsing object key - unexpected '}'; expected string literal"); CHECK_THROWS_WITH(parser_helper("}"), - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected '}'; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected '}'; expected '[', '{', or a literal"); // missing/unexpected end of string CHECK_THROWS_AS(parser_helper("\""), json::parse_error&); @@ -1051,25 +1051,25 @@ TEST_CASE("parser class") CHECK_THROWS_AS(parser_helper("\"\\u01"), json::parse_error&); CHECK_THROWS_AS(parser_helper("\"\\u012"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("\""), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid string: missing closing quote; last read: '\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid string: missing closing quote; last read: '\"'"); CHECK_THROWS_WITH(parser_helper("\"\\\""), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: missing closing quote; last read: '\"\\\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: missing closing quote; last read: '\"\\\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u\""), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u0\""), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u01\""), - "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u012\""), - "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012\"'"); CHECK_THROWS_WITH(parser_helper("\"\\u"), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u'"); CHECK_THROWS_WITH(parser_helper("\"\\u0"), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u0'"); CHECK_THROWS_WITH(parser_helper("\"\\u01"), - "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01'"); + "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u01'"); CHECK_THROWS_WITH(parser_helper("\"\\u012"), - "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\u012'"); // invalid escapes for (int c = 1; c < 128; ++c) @@ -1106,7 +1106,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s.c_str()), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid string: forbidden character after backslash; last read: '\"\\" + std::string(1, static_cast(c)) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid string: forbidden character after backslash; last read: '\"\\" + std::string(1, static_cast(c)) + "'"); } break; } @@ -1182,7 +1182,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s1.c_str()), - "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s1.substr(0, 7) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s1.substr(0, 7) + "'"); } CAPTURE(s2); @@ -1191,7 +1191,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s2.c_str()), - "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s2.substr(0, 6) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 6: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s2.substr(0, 6) + "'"); } CAPTURE(s3); @@ -1200,7 +1200,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s3.c_str()), - "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s3.substr(0, 5) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 5: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s3.substr(0, 5) + "'"); } CAPTURE(s4); @@ -1209,7 +1209,7 @@ TEST_CASE("parser class") if (c > 0x1f) { CHECK_THROWS_WITH(parser_helper(s4.c_str()), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s4.substr(0, 4) + "'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '" + s4.substr(0, 4) + "'"); } } } @@ -1218,17 +1218,17 @@ TEST_CASE("parser class") // missing part of a surrogate pair CHECK_THROWS_AS(json::parse("\"\\uD80C\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD80C\""), - "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\"'"); // invalid surrogate pair CHECK_THROWS_AS(json::parse("\"\\uD80C\\uD80C\""), json::parse_error&); CHECK_THROWS_AS(json::parse("\"\\uD80C\\u0000\""), json::parse_error&); CHECK_THROWS_AS(json::parse("\"\\uD80C\\uFFFF\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD80C\\uD80C\""), - "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uD80C'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uD80C'"); CHECK_THROWS_WITH(json::parse("\"\\uD80C\\u0000\""), - "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\u0000'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\u0000'"); CHECK_THROWS_WITH(json::parse("\"\\uD80C\\uFFFF\""), - "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uFFFF'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD80C\\uFFFF'"); } SECTION("parse errors (accept)") @@ -1422,11 +1422,11 @@ TEST_CASE("parser class") // test case to make sure no comma preceeds the first key CHECK_THROWS_AS(parser_helper("{,\"key\": false}"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("{,\"key\": false}"), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - unexpected ','; expected string literal"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing object key - unexpected ','; expected string literal"); // test case to make sure an object is properly closed CHECK_THROWS_AS(parser_helper("[{\"key\": false true]"), json::parse_error&); CHECK_THROWS_WITH(parser_helper("[{\"key\": false true]"), - "[json.exception.parse_error.101] parse error at line 1, column 19: syntax error - unexpected true literal; expected '}'"); + "[json.exception.parse_error.101] parse error at line 1, column 19: syntax error while parsing object - unexpected true literal; expected '}'"); // test case to make sure the callback is properly evaluated after reading a key { @@ -1677,7 +1677,7 @@ TEST_CASE("parser class") CHECK_THROWS_AS(json::parse("{\"foo\": true:", cb), json::parse_error&); CHECK_THROWS_WITH(json::parse("{\"foo\": true:", cb), - "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - unexpected ':'; expected '}'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing object - unexpected ':'; expected '}'"); CHECK_THROWS_AS(json::parse("1.18973e+4932", cb), json::out_of_range&); CHECK_THROWS_WITH(json::parse("1.18973e+4932", cb), diff --git a/test/src/unit-deserialization.cpp b/test/src/unit-deserialization.cpp index 7806d5d4..8610cebd 100644 --- a/test/src/unit-deserialization.cpp +++ b/test/src/unit-deserialization.cpp @@ -267,7 +267,7 @@ TEST_CASE("deserialization") ss5 << "[\"foo\",1,2,3,false,{\"one\":1}"; CHECK_THROWS_AS(json::parse(ss1), json::parse_error&); CHECK_THROWS_WITH(json::parse(ss2), - "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'"); CHECK(not json::accept(ss3)); json j_error; @@ -291,7 +291,7 @@ TEST_CASE("deserialization") json::string_t s = "[\"foo\",1,2,3,false,{\"one\":1}"; CHECK_THROWS_AS(json::parse(s), json::parse_error&); CHECK_THROWS_WITH(json::parse(s), - "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'"); CHECK(not json::accept(s)); json j_error; @@ -318,7 +318,7 @@ TEST_CASE("deserialization") json j; CHECK_THROWS_AS(j << ss1, json::parse_error&); CHECK_THROWS_WITH(j << ss2, - "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'"); } SECTION("operator>>") @@ -329,14 +329,14 @@ TEST_CASE("deserialization") json j; CHECK_THROWS_AS(ss1 >> j, json::parse_error&); CHECK_THROWS_WITH(ss2 >> j, - "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'"); } SECTION("user-defined string literal") { CHECK_THROWS_AS("[\"foo\",1,2,3,false,{\"one\":1}"_json, json::parse_error&); CHECK_THROWS_WITH("[\"foo\",1,2,3,false,{\"one\":1}"_json, - "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error - unexpected end of input; expected ']'"); + "[json.exception.parse_error.101] parse error at line 1, column 29: syntax error while parsing array - unexpected end of input; expected ']'"); } } @@ -612,7 +612,7 @@ TEST_CASE("deserialization") uint8_t v[] = {'\"', 0x7F, 0xDF, 0x7F}; CHECK_THROWS_AS(json::parse(std::begin(v), std::end(v)), json::parse_error&); CHECK_THROWS_WITH(json::parse(std::begin(v), std::end(v)), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - invalid string: ill-formed UTF-8 byte; last read: '\"\x7f\xdf\x7f'"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - invalid string: ill-formed UTF-8 byte; last read: '\"\x7f\xdf\x7f'"); CHECK(not json::accept(std::begin(v), std::end(v))); json j_error; @@ -799,11 +799,11 @@ TEST_CASE("deserialization") { CHECK_THROWS_AS(json::parse(bom), json::parse_error&); CHECK_THROWS_WITH(json::parse(bom), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); CHECK_THROWS_AS(json::parse(std::istringstream(bom)), json::parse_error&); CHECK_THROWS_WITH(json::parse(std::istringstream(bom)), - "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 4: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); SaxEventLogger l; CHECK(not json::sax_parse(bom, &l)); @@ -838,11 +838,11 @@ TEST_CASE("deserialization") { CHECK_THROWS_AS(json::parse(bom.substr(0, 2)), json::parse_error&); CHECK_THROWS_WITH(json::parse(bom.substr(0, 2)), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'"); CHECK_THROWS_AS(json::parse(std::istringstream(bom.substr(0, 2))), json::parse_error&); CHECK_THROWS_WITH(json::parse(std::istringstream(bom.substr(0, 2))), - "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'"); + "[json.exception.parse_error.101] parse error at line 1, column 3: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF\xBB'"); SaxEventLogger l1, l2; CHECK(not json::sax_parse(std::istringstream(bom.substr(0, 2)), &l1)); @@ -863,11 +863,11 @@ TEST_CASE("deserialization") { CHECK_THROWS_AS(json::parse(bom.substr(0, 1)), json::parse_error&); CHECK_THROWS_WITH(json::parse(bom.substr(0, 1)), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'"); CHECK_THROWS_AS(json::parse(std::istringstream(bom.substr(0, 1))), json::parse_error&); CHECK_THROWS_WITH(json::parse(std::istringstream(bom.substr(0, 1))), - "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'"); + "[json.exception.parse_error.101] parse error at line 1, column 2: syntax error while parsing value - invalid BOM; must be 0xEF 0xBB 0xBF if given; last read: '\xEF'"); SaxEventLogger l1, l2; CHECK(not json::sax_parse(std::istringstream(bom.substr(0, 1)), &l1)); diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index 475104ce..fe4913cb 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -725,7 +725,7 @@ TEST_CASE("regression tests") { std::ifstream f("file_not_found.json"); CHECK_THROWS_AS(json::parse(f), json::parse_error&); - CHECK_THROWS_WITH(json::parse(f), "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + CHECK_THROWS_WITH(json::parse(f), "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("issue #367 - calling stream at EOF") @@ -741,7 +741,7 @@ TEST_CASE("regression tests") // a parse error because of the EOF. CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("issue #367 - behavior of operator>> should more closely resemble that of built-in overloads") @@ -752,7 +752,7 @@ TEST_CASE("regression tests") json j; CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("(whitespace)") @@ -762,7 +762,7 @@ TEST_CASE("regression tests") json j; CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("one value") @@ -775,7 +775,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("one value + whitespace") @@ -788,7 +788,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("whitespace + one value") @@ -801,7 +801,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("three values") @@ -818,7 +818,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("literals without whitespace") @@ -837,7 +837,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("example from #529") @@ -852,7 +852,7 @@ TEST_CASE("regression tests") CHECK_THROWS_AS(ss >> j, json::parse_error&); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error - unexpected end of input; expected '[', '{', or a literal"); + "[json.exception.parse_error.101] parse error at line 1, column 1: syntax error while parsing value - unexpected end of input; expected '[', '{', or a literal"); } SECTION("second example from #529") diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index 3ce446f7..4def1a3e 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -931,31 +931,31 @@ TEST_CASE("Unicode", "[hide]") { CHECK_THROWS_AS(json::parse("\"\\uDC00\\uDC00\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uDC00\\uDC00\""), - "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uDC00'"); + "[json.exception.parse_error.101] parse error at line 1, column 7: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uDC00'"); CHECK_THROWS_AS(json::parse("\"\\uD7FF\\uDC00\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD7FF\\uDC00\""), - "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uD7FF\\uDC00'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF; last read: '\"\\uD7FF\\uDC00'"); CHECK_THROWS_AS(json::parse("\"\\uD800]\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800]\""), - "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800]'"); + "[json.exception.parse_error.101] parse error at line 1, column 8: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800]'"); CHECK_THROWS_AS(json::parse("\"\\uD800\\v\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800\\v\""), - "[json.exception.parse_error.101] parse error at line 1, column 9: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\v'"); + "[json.exception.parse_error.101] parse error at line 1, column 9: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\v'"); CHECK_THROWS_AS(json::parse("\"\\uD800\\u123\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800\\u123\""), - "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\uD800\\u123\"'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: '\\u' must be followed by 4 hex digits; last read: '\"\\uD800\\u123\"'"); CHECK_THROWS_AS(json::parse("\"\\uD800\\uDBFF\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800\\uDBFF\""), - "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uDBFF'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uDBFF'"); CHECK_THROWS_AS(json::parse("\"\\uD800\\uE000\""), json::parse_error&); CHECK_THROWS_WITH(json::parse("\"\\uD800\\uE000\""), - "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uE000'"); + "[json.exception.parse_error.101] parse error at line 1, column 13: syntax error while parsing value - invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; last read: '\"\\uD800\\uE000'"); } } From 6d34d64bfdb1b06e5a80ac14b35abddd0006d9c5 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 8 Oct 2018 06:54:51 +0200 Subject: [PATCH 32/77] :ambulance: fixed compilation error --- include/nlohmann/detail/json_ref.hpp | 4 ++-- single_include/nlohmann/json.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/detail/json_ref.hpp b/include/nlohmann/detail/json_ref.hpp index b9abc47a..f9dba5de 100644 --- a/include/nlohmann/detail/json_ref.hpp +++ b/include/nlohmann/detail/json_ref.hpp @@ -31,10 +31,10 @@ class json_ref {} // class should be movable only - json_ref(json_ref&&) noexcept = default; + json_ref(json_ref&&) = default; json_ref(const json_ref&) = delete; json_ref& operator=(const json_ref&) = delete; - json_ref& operator=(json_ref&&) noexcept = default; + json_ref& operator=(json_ref&&) = delete; ~json_ref() = default; value_type moved_or_copied() const diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 583eb874..d4422c59 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -10375,10 +10375,10 @@ class json_ref {} // class should be movable only - json_ref(json_ref&&) noexcept = default; + json_ref(json_ref&&) = default; json_ref(const json_ref&) = delete; json_ref& operator=(const json_ref&) = delete; - json_ref& operator=(json_ref&&) noexcept = default; + json_ref& operator=(json_ref&&) = delete; ~json_ref() = default; value_type moved_or_copied() const From 11fecc25af64529599e9a24675651115d6bae322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20DELRIEU?= Date: Fri, 12 Oct 2018 10:54:58 +0200 Subject: [PATCH 33/77] add constraints for variadic json_ref constructors Fixes #1292 --- include/nlohmann/detail/json_ref.hpp | 12 ++++++++---- single_include/nlohmann/json.hpp | 13 +++++++++---- test/src/unit-regression.cpp | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/include/nlohmann/detail/json_ref.hpp b/include/nlohmann/detail/json_ref.hpp index f9dba5de..c8dec733 100644 --- a/include/nlohmann/detail/json_ref.hpp +++ b/include/nlohmann/detail/json_ref.hpp @@ -3,6 +3,8 @@ #include #include +#include + namespace nlohmann { namespace detail @@ -25,10 +27,12 @@ class json_ref : owned_value(init), value_ref(&owned_value), is_rvalue(true) {} - template - json_ref(Args&& ... args) - : owned_value(std::forward(args)...), value_ref(&owned_value), is_rvalue(true) - {} + template < + class... Args, + enable_if_t::value, int> = 0 > + json_ref(Args && ... args) + : owned_value(std::forward(args)...), value_ref(&owned_value), + is_rvalue(true) {} // class should be movable only json_ref(json_ref&&) = default; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index af1c8546..dc206d30 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -10591,6 +10591,9 @@ class serializer #include #include +// #include + + namespace nlohmann { namespace detail @@ -10613,10 +10616,12 @@ class json_ref : owned_value(init), value_ref(&owned_value), is_rvalue(true) {} - template - json_ref(Args&& ... args) - : owned_value(std::forward(args)...), value_ref(&owned_value), is_rvalue(true) - {} + template < + class... Args, + enable_if_t::value, int> = 0 > + json_ref(Args && ... args) + : owned_value(std::forward(args)...), value_ref(&owned_value), + is_rvalue(true) {} // class should be movable only json_ref(json_ref&&) = default; diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index fe4913cb..98a53a50 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -33,6 +33,14 @@ SOFTWARE. #include using nlohmann::json; +#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 + #define JSON_HAS_CPP_17 +#endif + +#ifdef JSON_HAS_CPP_17 + #include +#endif + #include "fifo_map.hpp" #include @@ -1649,4 +1657,12 @@ TEST_CASE("regression tests") CHECK(diffs.size() == 1); // Note the change here, was 2 } + +#ifdef JSON_HAS_CPP_17 + SECTION("issue #1292 - Serializing std::variant causes stack overflow") + { + static_assert( + not std::is_constructible>::value, ""); + } +#endif } From 45c8af2c46b01388cd2c6cf201f02f5761915313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20DELRIEU?= Date: Tue, 16 Oct 2018 14:00:34 +0200 Subject: [PATCH 34/77] add new is_constructible_* traits used in from_json is_compatible_* traits were used in from_json, but it made no sense whatsoever. It used to work because of non-SFINAE correctness + json_ref unconstrained variadic template constructor. SFINAE checks are becoming quite complex, we need a specification of some sort describing: * which concepts the library uses * how the conversion to/from json works in detail Having such a specification would really help simplifying the current code (as well as having meaningful checks). Fixes !1299 --- .../nlohmann/detail/conversions/from_json.hpp | 48 ++-- include/nlohmann/detail/meta/type_traits.hpp | 196 ++++++++++---- single_include/nlohmann/json.hpp | 244 ++++++++++++------ test/src/unit-regression.cpp | 42 +++ 4 files changed, 378 insertions(+), 152 deletions(-) diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp index 358b1c65..8f8162ff 100644 --- a/include/nlohmann/detail/conversions/from_json.hpp +++ b/include/nlohmann/detail/conversions/from_json.hpp @@ -84,13 +84,13 @@ void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s) } template < - typename BasicJsonType, typename CompatibleStringType, + typename BasicJsonType, typename ConstructibleStringType, enable_if_t < - is_compatible_string_type::value and + is_constructible_string_type::value and not std::is_same::value, + ConstructibleStringType>::value, int > = 0 > -void from_json(const BasicJsonType& j, CompatibleStringType& s) +void from_json(const BasicJsonType& j, ConstructibleStringType& s) { if (JSON_UNLIKELY(not j.is_string())) { @@ -173,11 +173,11 @@ auto from_json_array_impl(const BasicJsonType& j, std::array& arr, } } -template -auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<1> /*unused*/) +template +auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/) -> decltype( - arr.reserve(std::declval()), - j.template get(), + arr.reserve(std::declval()), + j.template get(), void()) { using std::end; @@ -188,12 +188,12 @@ auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, prio { // get() returns *this, this won't call a from_json // method when value_type is BasicJsonType - return i.template get(); + return i.template get(); }); } -template -void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, +template +void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<0> /*unused*/) { using std::end; @@ -204,21 +204,21 @@ void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, { // get() returns *this, this won't call a from_json // method when value_type is BasicJsonType - return i.template get(); + return i.template get(); }); } -template ::value and - not is_compatible_object_type::value and - not is_compatible_string_type::value and - not is_basic_json::value, + is_constructible_array_type::value and + not is_constructible_object_type::value and + not is_constructible_string_type::value and + not is_basic_json::value, int > = 0 > -auto from_json(const BasicJsonType& j, CompatibleArrayType& arr) +auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr) -> decltype(from_json_array_impl(j, arr, priority_tag<3> {}), -j.template get(), +j.template get(), void()) { if (JSON_UNLIKELY(not j.is_array())) @@ -230,9 +230,9 @@ void()) from_json_array_impl(j, arr, priority_tag<3> {}); } -template::value, int> = 0> -void from_json(const BasicJsonType& j, CompatibleObjectType& obj) +template::value, int> = 0> +void from_json(const BasicJsonType& j, ConstructibleObjectType& obj) { if (JSON_UNLIKELY(not j.is_object())) { @@ -240,13 +240,13 @@ void from_json(const BasicJsonType& j, CompatibleObjectType& obj) } auto inner_object = j.template get_ptr(); - using value_type = typename CompatibleObjectType::value_type; + using value_type = typename ConstructibleObjectType::value_type; std::transform( inner_object->begin(), inner_object->end(), std::inserter(obj, obj.begin()), [](typename BasicJsonType::object_t::value_type const & p) { - return value_type(p.first, p.second.template get()); + return value_type(p.first, p.second.template get()); }); } diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index 1a1a1744..7f71313c 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -68,6 +68,52 @@ using from_json_function = decltype(T::from_json(std::declval()...)); template using get_template_function = decltype(std::declval().template get()); +// trait checking if JSONSerializer::from_json(json const&, udt&) exists +template +struct has_from_json : std::false_type {}; + +template +struct has_from_json::value>> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if JSONSerializer::from_json(json const&) exists +// this overload is used for non-default-constructible user-defined-types +template +struct has_non_default_from_json : std::false_type {}; + +template +struct has_non_default_from_json::value>> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if BasicJsonType::json_serializer::to_json exists +// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. +template +struct has_to_json : std::false_type {}; + +template +struct has_to_json::value>> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + + /////////////////// // is_ functions // /////////////////// @@ -123,6 +169,35 @@ template struct is_compatible_object_type : is_compatible_object_type_impl {}; +template +struct is_constructible_object_type_impl : std::false_type {}; + +template +struct is_constructible_object_type_impl < + BasicJsonType, ConstructibleObjectType, + enable_if_t::value and + is_detected::value >> +{ + using object_t = typename BasicJsonType::object_t; + + static constexpr bool value = + std::is_constructible::value and + std::is_same::value or + (has_from_json::value or + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value); +}; + +template +struct is_constructible_object_type + : is_constructible_object_type_impl {}; + template struct is_compatible_string_type_impl : std::false_type {}; @@ -137,9 +212,28 @@ struct is_compatible_string_type_impl < std::is_constructible::value; }; -template +template struct is_compatible_string_type - : is_compatible_string_type_impl {}; + : is_compatible_string_type_impl {}; + +template +struct is_constructible_string_type_impl : std::false_type {}; + +template +struct is_constructible_string_type_impl < + BasicJsonType, ConstrutibleStringType, + enable_if_t::value >> +{ + static constexpr auto value = + std::is_constructible::value; +}; + +template +struct is_constructible_string_type + : is_constructible_string_type_impl {}; template struct is_compatible_array_type_impl : std::false_type {}; @@ -148,18 +242,61 @@ template struct is_compatible_array_type_impl < BasicJsonType, CompatibleArrayType, enable_if_t::value and - is_detected::value >> + is_detected::value and +// This is needed because json_reverse_iterator has a ::iterator type... +// Therefore it is detected as a CompatibleArrayType. +// The real fix would be to have an Iterable concept. + not is_iterator_traits< + std::iterator_traits>::value >> { - // This is needed because json_reverse_iterator has a ::iterator type... - // Therefore it is detected as a CompatibleArrayType. - // The real fix would be to have an Iterable concept. - static constexpr bool value = not is_iterator_traits>::value; + static constexpr bool value = + std::is_constructible::value; }; template struct is_compatible_array_type : is_compatible_array_type_impl {}; +template +struct is_constructible_array_type_impl : std::false_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t::value >> + : std::true_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t::value and + is_detected::value and + is_detected::value and + is_complete_type< + detected_t>::value >> +{ + static constexpr bool value = + // This is needed because json_reverse_iterator has a ::iterator type, + // furthermore, std::back_insert_iterator (and other iterators) have a base class `iterator`... + // Therefore it is detected as a ConstructibleArrayType. + // The real fix would be to have an Iterable concept. + not is_iterator_traits < + std::iterator_traits>::value and + + (std::is_same::value or + has_from_json::value or + has_non_default_from_json < + BasicJsonType, typename ConstructibleArrayType::value_type >::value); +}; + +template +struct is_constructible_array_type + : is_constructible_array_type_impl {}; + template struct is_compatible_integer_type_impl : std::false_type {}; @@ -187,51 +324,6 @@ struct is_compatible_integer_type : is_compatible_integer_type_impl {}; -// trait checking if JSONSerializer::from_json(json const&, udt&) exists -template -struct has_from_json : std::false_type {}; - -template -struct has_from_json::value>> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -// This trait checks if JSONSerializer::from_json(json const&) exists -// this overload is used for non-default-constructible user-defined-types -template -struct has_non_default_from_json : std::false_type {}; - -template -struct has_non_default_from_json::value>> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -// This trait checks if BasicJsonType::json_serializer::to_json exists -// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. -template -struct has_to_json : std::false_type {}; - -template -struct has_to_json::value>> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - template struct is_compatible_type_impl: std::false_type {}; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index dc206d30..ffd16603 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -428,6 +428,52 @@ using from_json_function = decltype(T::from_json(std::declval()...)); template using get_template_function = decltype(std::declval().template get()); +// trait checking if JSONSerializer::from_json(json const&, udt&) exists +template +struct has_from_json : std::false_type {}; + +template +struct has_from_json::value>> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if JSONSerializer::from_json(json const&) exists +// this overload is used for non-default-constructible user-defined-types +template +struct has_non_default_from_json : std::false_type {}; + +template +struct has_non_default_from_json::value>> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if BasicJsonType::json_serializer::to_json exists +// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. +template +struct has_to_json : std::false_type {}; + +template +struct has_to_json::value>> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + + /////////////////// // is_ functions // /////////////////// @@ -483,6 +529,35 @@ template struct is_compatible_object_type : is_compatible_object_type_impl {}; +template +struct is_constructible_object_type_impl : std::false_type {}; + +template +struct is_constructible_object_type_impl < + BasicJsonType, ConstructibleObjectType, + enable_if_t::value and + is_detected::value >> +{ + using object_t = typename BasicJsonType::object_t; + + static constexpr bool value = + std::is_constructible::value and + std::is_same::value or + (has_from_json::value or + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value); +}; + +template +struct is_constructible_object_type + : is_constructible_object_type_impl {}; + template struct is_compatible_string_type_impl : std::false_type {}; @@ -497,9 +572,28 @@ struct is_compatible_string_type_impl < std::is_constructible::value; }; -template +template struct is_compatible_string_type - : is_compatible_string_type_impl {}; + : is_compatible_string_type_impl {}; + +template +struct is_constructible_string_type_impl : std::false_type {}; + +template +struct is_constructible_string_type_impl < + BasicJsonType, ConstrutibleStringType, + enable_if_t::value >> +{ + static constexpr auto value = + std::is_constructible::value; +}; + +template +struct is_constructible_string_type + : is_constructible_string_type_impl {}; template struct is_compatible_array_type_impl : std::false_type {}; @@ -508,18 +602,61 @@ template struct is_compatible_array_type_impl < BasicJsonType, CompatibleArrayType, enable_if_t::value and - is_detected::value >> + is_detected::value and +// This is needed because json_reverse_iterator has a ::iterator type... +// Therefore it is detected as a CompatibleArrayType. +// The real fix would be to have an Iterable concept. + not is_iterator_traits< + std::iterator_traits>::value >> { - // This is needed because json_reverse_iterator has a ::iterator type... - // Therefore it is detected as a CompatibleArrayType. - // The real fix would be to have an Iterable concept. - static constexpr bool value = not is_iterator_traits>::value; + static constexpr bool value = + std::is_constructible::value; }; template struct is_compatible_array_type : is_compatible_array_type_impl {}; +template +struct is_constructible_array_type_impl : std::false_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t::value >> + : std::true_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t::value and + is_detected::value and + is_detected::value and + is_complete_type< + detected_t>::value >> +{ + static constexpr bool value = + // This is needed because json_reverse_iterator has a ::iterator type, + // furthermore, std::back_insert_iterator (and other iterators) have a base class `iterator`... + // Therefore it is detected as a ConstructibleArrayType. + // The real fix would be to have an Iterable concept. + not is_iterator_traits < + std::iterator_traits>::value and + + (std::is_same::value or + has_from_json::value or + has_non_default_from_json < + BasicJsonType, typename ConstructibleArrayType::value_type >::value); +}; + +template +struct is_constructible_array_type + : is_constructible_array_type_impl {}; + template struct is_compatible_integer_type_impl : std::false_type {}; @@ -547,51 +684,6 @@ struct is_compatible_integer_type : is_compatible_integer_type_impl {}; -// trait checking if JSONSerializer::from_json(json const&, udt&) exists -template -struct has_from_json : std::false_type {}; - -template -struct has_from_json::value>> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -// This trait checks if JSONSerializer::from_json(json const&) exists -// this overload is used for non-default-constructible user-defined-types -template -struct has_non_default_from_json : std::false_type {}; - -template -struct has_non_default_from_json::value>> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - -// This trait checks if BasicJsonType::json_serializer::to_json exists -// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. -template -struct has_to_json : std::false_type {}; - -template -struct has_to_json::value>> -{ - using serializer = typename BasicJsonType::template json_serializer; - - static constexpr bool value = - is_detected_exact::value; -}; - template struct is_compatible_type_impl: std::false_type {}; @@ -1156,13 +1248,13 @@ void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s) } template < - typename BasicJsonType, typename CompatibleStringType, + typename BasicJsonType, typename ConstructibleStringType, enable_if_t < - is_compatible_string_type::value and + is_constructible_string_type::value and not std::is_same::value, + ConstructibleStringType>::value, int > = 0 > -void from_json(const BasicJsonType& j, CompatibleStringType& s) +void from_json(const BasicJsonType& j, ConstructibleStringType& s) { if (JSON_UNLIKELY(not j.is_string())) { @@ -1245,11 +1337,11 @@ auto from_json_array_impl(const BasicJsonType& j, std::array& arr, } } -template -auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<1> /*unused*/) +template +auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/) -> decltype( - arr.reserve(std::declval()), - j.template get(), + arr.reserve(std::declval()), + j.template get(), void()) { using std::end; @@ -1260,12 +1352,12 @@ auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, prio { // get() returns *this, this won't call a from_json // method when value_type is BasicJsonType - return i.template get(); + return i.template get(); }); } -template -void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, +template +void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<0> /*unused*/) { using std::end; @@ -1276,21 +1368,21 @@ void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, { // get() returns *this, this won't call a from_json // method when value_type is BasicJsonType - return i.template get(); + return i.template get(); }); } -template ::value and - not is_compatible_object_type::value and - not is_compatible_string_type::value and - not is_basic_json::value, + is_constructible_array_type::value and + not is_constructible_object_type::value and + not is_constructible_string_type::value and + not is_basic_json::value, int > = 0 > -auto from_json(const BasicJsonType& j, CompatibleArrayType& arr) +auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr) -> decltype(from_json_array_impl(j, arr, priority_tag<3> {}), -j.template get(), +j.template get(), void()) { if (JSON_UNLIKELY(not j.is_array())) @@ -1302,9 +1394,9 @@ void()) from_json_array_impl(j, arr, priority_tag<3> {}); } -template::value, int> = 0> -void from_json(const BasicJsonType& j, CompatibleObjectType& obj) +template::value, int> = 0> +void from_json(const BasicJsonType& j, ConstructibleObjectType& obj) { if (JSON_UNLIKELY(not j.is_object())) { @@ -1312,13 +1404,13 @@ void from_json(const BasicJsonType& j, CompatibleObjectType& obj) } auto inner_object = j.template get_ptr(); - using value_type = typename CompatibleObjectType::value_type; + using value_type = typename ConstructibleObjectType::value_type; std::transform( inner_object->begin(), inner_object->end(), std::inserter(obj, obj.begin()), [](typename BasicJsonType::object_t::value_type const & p) { - return value_type(p.first, p.second.template get()); + return value_type(p.first, p.second.template get()); }); } diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index 98a53a50..c810348a 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -121,6 +121,28 @@ struct nocopy j = {{"val", n.val}}; } }; + +struct Data +{ + std::string a; + std::string b; +}; + +void from_json(const json& j, Data& data) +{ + j["a"].get_to(data.a); + j["b"].get_to(data.b); +} + +bool operator==(Data const& lhs, Data const& rhs) +{ + return lhs.a == rhs.a && lhs.b == rhs.b; +} + +bool operator!=(Data const& lhs, Data const& rhs) +{ + return !(lhs == rhs); +} } ///////////////////////////////////////////////////////////////////// @@ -1665,4 +1687,24 @@ TEST_CASE("regression tests") not std::is_constructible>::value, ""); } #endif + + SECTION("issue #1299 - compile error in from_json converting to container " + "with std::pair") + { + json j = + { + {"1", {{"a", "testa_1"}, {"b", "testb_1"}}}, + {"2", {{"a", "testa_2"}, {"b", "testb_2"}}}, + {"3", {{"a", "testa_3"}, {"b", "testb_3"}}}, + }; + + std::map expected + { + {"1", {"testa_1", "testb_1" }}, + {"2", {"testa_2", "testb_2"}}, + {"3", {"testa_3", "testb_3"}}, + }; + const auto data = j.get(); + CHECK(expected == data); + } } From 5bccacda3018a944756156f1b9b5930c128fb32f Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Tue, 16 Oct 2018 19:13:07 +0200 Subject: [PATCH 35/77] BSON: throw json.exception.out_of_range.407 in case a value of type `std::uint64_t` is serialized to BSON. Also, added a missing EOF-check to binary_reader. --- include/nlohmann/detail/exceptions.hpp | 2 +- .../nlohmann/detail/input/binary_reader.hpp | 5 + .../nlohmann/detail/output/binary_writer.hpp | 7 +- single_include/nlohmann/json.hpp | 14 +- test/src/unit-bson.cpp | 354 +++++++++++++++++- 5 files changed, 376 insertions(+), 6 deletions(-) diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index 7edc0032..e23dd0d7 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -264,7 +264,7 @@ json.exception.out_of_range.403 | key 'foo' not found | The provided key was not json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved. json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value. json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. -json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON only supports integers numbers up to 9223372036854775807. | +json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. | json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | @liveexample{The following code shows how an `out_of_range` exception can be diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 2b3ff1ab..8dfe3b98 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -256,6 +256,11 @@ class binary_reader { while (auto element_type = get()) { + if (JSON_UNLIKELY(not unexpect_eof())) + { + return false; + } + const std::size_t element_type_parse_position = chars_read; string_t key; if (JSON_UNLIKELY(not get_bson_cstr(key))) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 0ec237ea..0a7cf45f 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -800,11 +800,16 @@ class binary_writer write_bson_entry_header(name, 0x10); // int32 write_number(static_cast(value)); } - else + else if (value <= static_cast((std::numeric_limits::max)())) { write_bson_entry_header(name, 0x12); // int64 write_number(static_cast(value)); } + else + { + JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(value))); + } + } /*! diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 98c6b1f1..4bd80c54 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -863,7 +863,7 @@ json.exception.out_of_range.403 | key 'foo' not found | The provided key was not json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved. json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value. json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. -json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON only supports integers numbers up to 9223372036854775807. | +json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. | json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | @liveexample{The following code shows how an `out_of_range` exception can be @@ -6198,6 +6198,11 @@ class binary_reader { while (auto element_type = get()) { + if (JSON_UNLIKELY(not unexpect_eof())) + { + return false; + } + const std::size_t element_type_parse_position = chars_read; string_t key; if (JSON_UNLIKELY(not get_bson_cstr(key))) @@ -8644,11 +8649,16 @@ class binary_writer write_bson_entry_header(name, 0x10); // int32 write_number(static_cast(value)); } - else + else if (value <= static_cast((std::numeric_limits::max)())) { write_bson_entry_header(name, 0x12); // int64 write_number(static_cast(value)); } + else + { + JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(value))); + } + } /*! diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 4a1b387e..58ad71bd 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -31,7 +31,6 @@ SOFTWARE. #include using nlohmann::json; - #include TEST_CASE("BSON") @@ -708,7 +707,7 @@ TEST_CASE("Incomplete BSON INPUT 3") // missing input data... }; CHECK_THROWS_WITH(json::from_bson(incomplete_bson), - "[json.exception.parse_error.110] parse error at 29: unexpected end of input"); + "[json.exception.parse_error.110] parse error at 28: unexpected end of input"); CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); SaxCountdown scp(1); @@ -752,3 +751,354 @@ TEST_CASE("Unsupported BSON input") } + +TEST_CASE("BSON numerical data") +{ + SECTION("number") + { + SECTION("signed") + { + SECTION("std::int64_t: INT64_MIN .. INT32_MIN-1") + { + std::vector numbers + { + INT64_MIN, + -1000000000000000000LL, + -100000000000000000LL, + -10000000000000000LL, + -1000000000000000LL, + -100000000000000LL, + -10000000000000LL, + -1000000000000LL, + -100000000000LL, + -10000000000LL, + static_cast(INT32_MIN) - 1, + }; + + for (auto i : numbers) + { + + CAPTURE(i); + + json j = + { + { "entry", i } + }; + CHECK(j.at("entry").is_number_integer()); + + std::uint64_t iu = *reinterpret_cast(&i); + std::vector expected_bson = + { + 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) + 0x12u, /// entry: int64 + 'e', 'n', 't', 'r', 'y', '\x00', + static_cast((iu >> (8u * 0u)) & 0xffu), + static_cast((iu >> (8u * 1u)) & 0xffu), + static_cast((iu >> (8u * 2u)) & 0xffu), + static_cast((iu >> (8u * 3u)) & 0xffu), + static_cast((iu >> (8u * 4u)) & 0xffu), + static_cast((iu >> (8u * 5u)) & 0xffu), + static_cast((iu >> (8u * 6u)) & 0xffu), + static_cast((iu >> (8u * 7u)) & 0xffu), + 0x00u // end marker + }; + + const auto bson = json::to_bson(j); + CHECK(bson == expected_bson); + + auto j_roundtrip = json::from_bson(bson); + + CHECK(j_roundtrip.at("entry").is_number_integer()); + CHECK(j_roundtrip == j); + CHECK(json::from_bson(bson, true, false) == j); + + } + } + + + SECTION("signed std::int32_t: INT32_MIN .. INT32_MAX") + { + std::vector numbers + { + INT32_MIN, + -2147483647L, + -1000000000L, + -100000000L, + -10000000L, + -1000000L, + -100000L, + -10000L, + -1000L, + -100L, + -10L, + -1L, + 0L, + 1L, + 10L, + 100L, + 1000L, + 10000L, + 100000L, + 1000000L, + 10000000L, + 100000000L, + 1000000000L, + 2147483646L, + INT32_MAX + }; + + for (auto i : numbers) + { + + CAPTURE(i); + + json j = + { + { "entry", i } + }; + CHECK(j.at("entry").is_number_integer()); + + std::uint64_t iu = *reinterpret_cast(&i); + std::vector expected_bson = + { + 0x10u, 0x00u, 0x00u, 0x00u, // size (little endian) + 0x10u, /// entry: int32 + 'e', 'n', 't', 'r', 'y', '\x00', + static_cast((iu >> (8u * 0u)) & 0xffu), + static_cast((iu >> (8u * 1u)) & 0xffu), + static_cast((iu >> (8u * 2u)) & 0xffu), + static_cast((iu >> (8u * 3u)) & 0xffu), + 0x00u // end marker + }; + + const auto bson = json::to_bson(j); + CHECK(bson == expected_bson); + + auto j_roundtrip = json::from_bson(bson); + + CHECK(j_roundtrip.at("entry").is_number_integer()); + CHECK(j_roundtrip == j); + CHECK(json::from_bson(bson, true, false) == j); + + } + } + + SECTION("signed std::int64_t: INT32_MAX+1 .. INT64_MAX") + { + std::vector numbers + { + INT64_MAX, + 1000000000000000000LL, + 100000000000000000LL, + 10000000000000000LL, + 1000000000000000LL, + 100000000000000LL, + 10000000000000LL, + 1000000000000LL, + 100000000000LL, + 10000000000LL, + static_cast(INT32_MAX) + 1, + }; + + for (auto i : numbers) + { + + CAPTURE(i); + + json j = + { + { "entry", i } + }; + CHECK(j.at("entry").is_number_integer()); + + std::uint64_t iu = *reinterpret_cast(&i); + std::vector expected_bson = + { + 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) + 0x12u, /// entry: int64 + 'e', 'n', 't', 'r', 'y', '\x00', + static_cast((iu >> (8u * 0u)) & 0xffu), + static_cast((iu >> (8u * 1u)) & 0xffu), + static_cast((iu >> (8u * 2u)) & 0xffu), + static_cast((iu >> (8u * 3u)) & 0xffu), + static_cast((iu >> (8u * 4u)) & 0xffu), + static_cast((iu >> (8u * 5u)) & 0xffu), + static_cast((iu >> (8u * 6u)) & 0xffu), + static_cast((iu >> (8u * 7u)) & 0xffu), + 0x00u // end marker + }; + + const auto bson = json::to_bson(j); + CHECK(bson == expected_bson); + + auto j_roundtrip = json::from_bson(bson); + + CHECK(j_roundtrip.at("entry").is_number_integer()); + CHECK(j_roundtrip == j); + CHECK(json::from_bson(bson, true, false) == j); + + } + } + } + + SECTION("unsigned") + { + SECTION("unsigned std::uint64_t: 0 .. INT32_MAX") + { + std::vector numbers + { + 0ULL, + 1ULL, + 10ULL, + 100ULL, + 1000ULL, + 10000ULL, + 100000ULL, + 1000000ULL, + 10000000ULL, + 100000000ULL, + 1000000000ULL, + 2147483646ULL, + static_cast(INT32_MAX) + }; + + for (auto i : numbers) + { + + CAPTURE(i); + + json j = + { + { "entry", i } + }; + + std::uint64_t iu = *reinterpret_cast(&i); + std::vector expected_bson = + { + 0x10u, 0x00u, 0x00u, 0x00u, // size (little endian) + 0x10u, /// entry: int32 + 'e', 'n', 't', 'r', 'y', '\x00', + static_cast((iu >> (8u * 0u)) & 0xffu), + static_cast((iu >> (8u * 1u)) & 0xffu), + static_cast((iu >> (8u * 2u)) & 0xffu), + static_cast((iu >> (8u * 3u)) & 0xffu), + 0x00u // end marker + }; + + const auto bson = json::to_bson(j); + CHECK(bson == expected_bson); + + auto j_roundtrip = json::from_bson(bson); + + CHECK(j.at("entry").is_number_unsigned()); + CHECK(j_roundtrip.at("entry").is_number_integer()); + CHECK(j_roundtrip == j); + CHECK(json::from_bson(bson, true, false) == j); + + } + } + + SECTION("unsigned std::uint64_t: INT32_MAX+1 .. INT64_MAX") + { + std::vector numbers + { + static_cast(INT32_MAX) + 1, + 4000000000ULL, + static_cast(UINT32_MAX), + 10000000000ULL, + 100000000000ULL, + 1000000000000ULL, + 10000000000000ULL, + 100000000000000ULL, + 1000000000000000ULL, + 10000000000000000ULL, + 100000000000000000ULL, + 1000000000000000000ULL, + static_cast(INT64_MAX), + }; + + for (auto i : numbers) + { + + CAPTURE(i); + + json j = + { + { "entry", i } + }; + + std::uint64_t iu = *reinterpret_cast(&i); + std::vector expected_bson = + { + 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) + 0x12u, /// entry: int64 + 'e', 'n', 't', 'r', 'y', '\x00', + static_cast((iu >> (8u * 0u)) & 0xffu), + static_cast((iu >> (8u * 1u)) & 0xffu), + static_cast((iu >> (8u * 2u)) & 0xffu), + static_cast((iu >> (8u * 3u)) & 0xffu), + static_cast((iu >> (8u * 4u)) & 0xffu), + static_cast((iu >> (8u * 5u)) & 0xffu), + static_cast((iu >> (8u * 6u)) & 0xffu), + static_cast((iu >> (8u * 7u)) & 0xffu), + 0x00u // end marker + }; + + const auto bson = json::to_bson(j); + CHECK(bson == expected_bson); + + auto j_roundtrip = json::from_bson(bson); + + CHECK(j.at("entry").is_number_unsigned()); + CHECK(j_roundtrip.at("entry").is_number_integer()); + CHECK(j_roundtrip == j); + CHECK(json::from_bson(bson, true, false) == j); + } + } + + SECTION("unsigned std::uint64_t: INT64_MAX+1 .. UINT64_MAX") + { + std::vector numbers + { + static_cast(INT64_MAX) + 1ULL, + 10000000000000000000ULL, + 18000000000000000000ULL, + UINT64_MAX - 1ULL, + UINT64_MAX, + }; + + for (auto i : numbers) + { + + CAPTURE(i); + + json j = + { + { "entry", i } + }; + + std::uint64_t iu = *reinterpret_cast(&i); + std::vector expected_bson = + { + 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) + 0x12u, /// entry: int64 + 'e', 'n', 't', 'r', 'y', '\x00', + static_cast((iu >> (8u * 0u)) & 0xffu), + static_cast((iu >> (8u * 1u)) & 0xffu), + static_cast((iu >> (8u * 2u)) & 0xffu), + static_cast((iu >> (8u * 3u)) & 0xffu), + static_cast((iu >> (8u * 4u)) & 0xffu), + static_cast((iu >> (8u * 5u)) & 0xffu), + static_cast((iu >> (8u * 6u)) & 0xffu), + static_cast((iu >> (8u * 7u)) & 0xffu), + 0x00u // end marker + }; + + CHECK_THROWS_AS(json::to_bson(j), json::out_of_range&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.407] number overflow serializing " + std::to_string(i)); + } + } + + } + } +} From daa3ca8a2e42446a3d7fd0ae83bcffa59713b6c7 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Tue, 16 Oct 2018 19:29:42 +0200 Subject: [PATCH 36/77] BSON: Adjusted documentation of `binary_writer::to_bson()` --- include/nlohmann/json.hpp | 7 ++++++- single_include/nlohmann/json.hpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 1b61e995..c973f0a0 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -6609,6 +6609,7 @@ class basic_json number_integer | 2147483648..9223372036854775807 | int64 | 0x12 number_unsigned | 0..2147483647 | int32 | 0x10 number_unsigned | 2147483648..9223372036854775807 | int64 | 0x12 + number_unsigned | 9223372036854775808..18446744073709551615| -- | -- number_float | *any value* | double | 0x01 string | *any value* | string | 0x02 array | *any value* | document | 0x04 @@ -6616,8 +6617,12 @@ class basic_json @warning The mapping is **incomplete**, since only JSON-objects (and things contained therein) can be serialized to BSON. + Also, integers larger than 9223372036854775807 cannot be serialized to BSON. - @pre The input `j` is required to be an object: `j.is_object() == true` + @throw out_of_range.407 if `j.is_number_unsigned() && j.get() > 9223372036854775807` + @throw type_error.317 if `!j.is_object()` + + @pre The input `j` is required to be an object: `j.is_object() == true`. @note Any BSON output created via @ref to_bson can be successfully parsed by @ref from_bson. diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 4bd80c54..87abf2ca 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -18195,6 +18195,7 @@ class basic_json number_integer | 2147483648..9223372036854775807 | int64 | 0x12 number_unsigned | 0..2147483647 | int32 | 0x10 number_unsigned | 2147483648..9223372036854775807 | int64 | 0x12 + number_unsigned | 9223372036854775808..18446744073709551615| -- | -- number_float | *any value* | double | 0x01 string | *any value* | string | 0x02 array | *any value* | document | 0x04 @@ -18202,8 +18203,12 @@ class basic_json @warning The mapping is **incomplete**, since only JSON-objects (and things contained therein) can be serialized to BSON. + Also, integers larger than 9223372036854775807 cannot be serialized to BSON. - @pre The input `j` is required to be an object: `j.is_object() == true` + @throw out_of_range.407 if `j.is_number_unsigned() && j.get() > 9223372036854775807` + @throw type_error.317 if `!j.is_object()` + + @pre The input `j` is required to be an object: `j.is_object() == true`. @note Any BSON output created via @ref to_bson can be successfully parsed by @ref from_bson. From 0671e92ced71187690c81db645279d39ecf92e16 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 16 Oct 2018 20:38:50 +0200 Subject: [PATCH 37/77] :construction: proposal for different error handlers #1198 Proof of concept; currently only as parameter to the internal dump_escaped function; that is, not yet exposed to the dump function. --- include/nlohmann/detail/output/serializer.hpp | 67 +++++++++++++++++-- single_include/nlohmann/json.hpp | 67 +++++++++++++++++-- 2 files changed, 120 insertions(+), 14 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index bb74a86e..7adf0c2f 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -39,6 +39,14 @@ class serializer static constexpr uint8_t UTF8_REJECT = 1; public: + /// how to treat decoding errors + enum class error_handler_t + { + strict, ///< throw a type_error exception in case of invalid UTF-8 + replace, ///< replace invalid UTF-8 sequences with U+FFFD + ignore ///< ignore invalid UTF-8 sequences + }; + /*! @param[in] s output stream to serialize to @param[in] ichar indentation character to use @@ -278,10 +286,12 @@ class serializer @param[in] s the string to escape @param[in] ensure_ascii whether to escape non-ASCII characters with \uXXXX sequences + @param[in] error_handler how to react on decoding errors @complexity Linear in the length of string @a s. */ - void dump_escaped(const string_t& s, const bool ensure_ascii) + void dump_escaped(const string_t& s, const bool ensure_ascii, + const error_handler_t error_handler = error_handler_t::strict) { uint32_t codepoint; uint8_t state = UTF8_ACCEPT; @@ -389,9 +399,33 @@ class serializer case UTF8_REJECT: // decode found invalid UTF-8 byte { - std::string sn(3, '\0'); - snprintf(&sn[0], sn.size(), "%.2X", byte); - JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn)); + switch (error_handler) + { + case error_handler_t::strict: + { + std::string sn(3, '\0'); + snprintf(&sn[0], sn.size(), "%.2X", byte); + JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn)); + } + + case error_handler_t::ignore: + { + state = UTF8_ACCEPT; + continue; + } + + case error_handler_t::replace: + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'u'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'd'; + state = UTF8_ACCEPT; + continue; + } + } } default: // decode found yet incomplete multi-byte code point @@ -417,9 +451,28 @@ class serializer else { // we finish reading, but do not accept: string was incomplete - std::string sn(3, '\0'); - snprintf(&sn[0], sn.size(), "%.2X", static_cast(s.back())); - JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn)); + switch (error_handler) + { + case error_handler_t::strict: + { + std::string sn(3, '\0'); + snprintf(&sn[0], sn.size(), "%.2X", static_cast(s.back())); + JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn)); + } + + case error_handler_t::ignore: + { + break; + } + + case error_handler_t::replace: + { + // write buffer, but replace last byte + o->write_characters(string_buffer.data(), bytes - 1); + o->write_characters("\\ufffd", 6); + break; + } + } } } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index dc206d30..c4681d7b 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -9991,6 +9991,14 @@ class serializer static constexpr uint8_t UTF8_REJECT = 1; public: + /// how to treat decoding errors + enum class error_handler_t + { + strict, ///< throw a type_error exception in case of invalid UTF-8 + replace, ///< replace invalid UTF-8 sequences with U+FFFD + ignore ///< ignore invalid UTF-8 sequences + }; + /*! @param[in] s output stream to serialize to @param[in] ichar indentation character to use @@ -10230,10 +10238,12 @@ class serializer @param[in] s the string to escape @param[in] ensure_ascii whether to escape non-ASCII characters with \uXXXX sequences + @param[in] error_handler how to react on decoding errors @complexity Linear in the length of string @a s. */ - void dump_escaped(const string_t& s, const bool ensure_ascii) + void dump_escaped(const string_t& s, const bool ensure_ascii, + const error_handler_t error_handler = error_handler_t::strict) { uint32_t codepoint; uint8_t state = UTF8_ACCEPT; @@ -10341,9 +10351,33 @@ class serializer case UTF8_REJECT: // decode found invalid UTF-8 byte { - std::string sn(3, '\0'); - snprintf(&sn[0], sn.size(), "%.2X", byte); - JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn)); + switch (error_handler) + { + case error_handler_t::strict: + { + std::string sn(3, '\0'); + snprintf(&sn[0], sn.size(), "%.2X", byte); + JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn)); + } + + case error_handler_t::ignore: + { + state = UTF8_ACCEPT; + continue; + } + + case error_handler_t::replace: + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'u'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'd'; + state = UTF8_ACCEPT; + continue; + } + } } default: // decode found yet incomplete multi-byte code point @@ -10369,9 +10403,28 @@ class serializer else { // we finish reading, but do not accept: string was incomplete - std::string sn(3, '\0'); - snprintf(&sn[0], sn.size(), "%.2X", static_cast(s.back())); - JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn)); + switch (error_handler) + { + case error_handler_t::strict: + { + std::string sn(3, '\0'); + snprintf(&sn[0], sn.size(), "%.2X", static_cast(s.back())); + JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn)); + } + + case error_handler_t::ignore: + { + break; + } + + case error_handler_t::replace: + { + // write buffer, but replace last byte + o->write_characters(string_buffer.data(), bytes - 1); + o->write_characters("\\ufffd", 6); + break; + } + } } } From 978c3c4116e610ef67ecc93b8bf410e462fada0e Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Tue, 16 Oct 2018 20:42:00 +0200 Subject: [PATCH 38/77] BSON: throw `json.exception.out_of_range.409` in case a key to be serialized to BSON contains a U+0000 --- include/nlohmann/detail/exceptions.hpp | 1 + include/nlohmann/detail/output/binary_writer.hpp | 5 +++++ include/nlohmann/json.hpp | 5 ++++- single_include/nlohmann/json.hpp | 11 ++++++++++- test/src/unit-bson.cpp | 10 ++++++++++ 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index e23dd0d7..bab76b62 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -266,6 +266,7 @@ json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch op json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. | json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | +json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | @liveexample{The following code shows how an `out_of_range` exception can be caught.,out_of_range} diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 0a7cf45f..24c08001 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -681,6 +681,11 @@ class binary_writer */ static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { + if (name.find(static_cast(0)) != BasicJsonType::string_t::npos) + { + JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000")); + } + return /*id*/ 1ul + name.size() + /*zero-terminator*/1u; } diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index c973f0a0..64b32a7f 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -6617,9 +6617,12 @@ class basic_json @warning The mapping is **incomplete**, since only JSON-objects (and things contained therein) can be serialized to BSON. - Also, integers larger than 9223372036854775807 cannot be serialized to BSON. + Also, integers larger than 9223372036854775807 cannot be serialized to BSON, + and the keys may not contain U+0000, since they are serialized a + zero-terminated c-strings. @throw out_of_range.407 if `j.is_number_unsigned() && j.get() > 9223372036854775807` + @throw out_of_range.409 if a key in `j` contains a NULL (U+0000) @throw type_error.317 if `!j.is_object()` @pre The input `j` is required to be an object: `j.is_object() == true`. diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 87abf2ca..b5aaecf8 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -865,6 +865,7 @@ json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch op json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. | json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | +json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | @liveexample{The following code shows how an `out_of_range` exception can be caught.,out_of_range} @@ -8530,6 +8531,11 @@ class binary_writer */ static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { + if (name.find(static_cast(0)) != BasicJsonType::string_t::npos) + { + JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000")); + } + return /*id*/ 1ul + name.size() + /*zero-terminator*/1u; } @@ -18203,9 +18209,12 @@ class basic_json @warning The mapping is **incomplete**, since only JSON-objects (and things contained therein) can be serialized to BSON. - Also, integers larger than 9223372036854775807 cannot be serialized to BSON. + Also, integers larger than 9223372036854775807 cannot be serialized to BSON, + and the keys may not contain U+0000, since they are serialized a + zero-terminated c-strings. @throw out_of_range.407 if `j.is_number_unsigned() && j.get() > 9223372036854775807` + @throw out_of_range.409 if a key in `j` contains a NULL (U+0000) @throw type_error.317 if `!j.is_object()` @pre The input `j` is required to be an object: `j.is_object() == true`. diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 58ad71bd..f622ff30 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -91,6 +91,16 @@ TEST_CASE("BSON") } } + SECTION("keys containing code-point U+0000 cannot be serialized to BSON") + { + json j = + { + { std::string("en\0try", 6), true } + }; + REQUIRE_THROWS_AS(json::to_bson(j), json::out_of_range); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.409] BSON key cannot contain code point U+0000"); + } + SECTION("objects") { SECTION("empty object") From a946dfc19c3bbef2106d43b62e614e5e5671f9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20DELRIEU?= Date: Wed, 17 Oct 2018 12:03:10 +0200 Subject: [PATCH 39/77] add a note to maintainers in type_traits.hpp --- include/nlohmann/detail/meta/type_traits.hpp | 9 +++++++++ single_include/nlohmann/json.hpp | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index 7f71313c..efe878f6 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -26,6 +26,15 @@ namespace detail // helpers // ///////////// +// Note to maintainers: +// +// Every trait in this file expects a non CV-qualified type. +// The only exceptions are in the 'aliases for detected' section +// (i.e. those of the form: decltype(T::member_function(std::declval()))) +// +// In this case, T has to be properly CV-qualified to constraint the function arguments +// (e.g. to_json(BasicJsonType&, const T&)) + template struct is_basic_json : std::false_type {}; NLOHMANN_BASIC_JSON_TPL_DECLARATION diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index ffd16603..47c9f1c7 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -386,6 +386,15 @@ namespace detail // helpers // ///////////// +// Note to maintainers: +// +// Every trait in this file expects a non CV-qualified type. +// The only exceptions are in the 'aliases for detected' section +// (i.e. those of the form: decltype(T::member_function(std::declval()))) +// +// In this case, T has to be properly CV-qualified to constraint the function arguments +// (e.g. to_json(BasicJsonType&, const T&)) + template struct is_basic_json : std::false_type {}; NLOHMANN_BASIC_JSON_TPL_DECLARATION From dbb0b63187ba07cefb8981e83bc781be894ca874 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 17 Oct 2018 12:15:58 +0200 Subject: [PATCH 40/77] :wheelchair: improved error messages for binary formats #1288 This commit is the equivalent of #1282 for CBOR, MessagePack, and UBJSON. --- .../nlohmann/detail/input/binary_reader.hpp | 215 ++++++++++------- .../nlohmann/detail/output/binary_writer.hpp | 4 +- single_include/nlohmann/json.hpp | 219 +++++++++++------- test/src/unit-cbor.cpp | 62 ++--- test/src/unit-msgpack.cpp | 48 ++-- test/src/unit-regression.cpp | 36 +-- test/src/unit-ubjson.cpp | 62 ++--- 7 files changed, 364 insertions(+), 282 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index bb0c982b..57889644 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -100,7 +100,8 @@ class binary_reader if (JSON_UNLIKELY(current != std::char_traits::eof())) { - return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read, "expected end of input")); + return sax->parse_error(chars_read, get_token_string(), + parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"))); } } @@ -133,7 +134,7 @@ class binary_reader { // EOF case std::char_traits::eof(): - return unexpect_eof(); + return unexpect_eof(input_format_t::cbor, "value"); // Integer 0x00..0x17 (0..23) case 0x00: @@ -165,25 +166,25 @@ class binary_reader case 0x18: // Unsigned integer (one-byte uint8_t follows) { uint8_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::cbor, number) and sax->number_unsigned(number); } case 0x19: // Unsigned integer (two-byte uint16_t follows) { uint16_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::cbor, number) and sax->number_unsigned(number); } case 0x1A: // Unsigned integer (four-byte uint32_t follows) { uint32_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::cbor, number) and sax->number_unsigned(number); } case 0x1B: // Unsigned integer (eight-byte uint64_t follows) { uint64_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::cbor, number) and sax->number_unsigned(number); } // Negative integer -1-0x00..-1-0x17 (-1..-24) @@ -216,25 +217,25 @@ class binary_reader case 0x38: // Negative integer (one-byte uint8_t follows) { uint8_t number; - return get_number(number) and sax->number_integer(static_cast(-1) - number); + return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast(-1) - number); } case 0x39: // Negative integer -1-n (two-byte uint16_t follows) { uint16_t number; - return get_number(number) and sax->number_integer(static_cast(-1) - number); + return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast(-1) - number); } case 0x3A: // Negative integer -1-n (four-byte uint32_t follows) { uint32_t number; - return get_number(number) and sax->number_integer(static_cast(-1) - number); + return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast(-1) - number); } case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows) { uint64_t number; - return get_number(number) and sax->number_integer(static_cast(-1) + return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast(-1) - static_cast(number)); } @@ -303,25 +304,25 @@ class binary_reader case 0x98: // array (one-byte uint8_t for n follows) { uint8_t len; - return get_number(len) and get_cbor_array(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast(len)); } case 0x99: // array (two-byte uint16_t for n follow) { uint16_t len; - return get_number(len) and get_cbor_array(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast(len)); } case 0x9A: // array (four-byte uint32_t for n follow) { uint32_t len; - return get_number(len) and get_cbor_array(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast(len)); } case 0x9B: // array (eight-byte uint64_t for n follow) { uint64_t len; - return get_number(len) and get_cbor_array(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast(len)); } case 0x9F: // array (indefinite length) @@ -357,25 +358,25 @@ class binary_reader case 0xB8: // map (one-byte uint8_t for n follows) { uint8_t len; - return get_number(len) and get_cbor_object(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast(len)); } case 0xB9: // map (two-byte uint16_t for n follow) { uint16_t len; - return get_number(len) and get_cbor_object(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast(len)); } case 0xBA: // map (four-byte uint32_t for n follow) { uint32_t len; - return get_number(len) and get_cbor_object(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast(len)); } case 0xBB: // map (eight-byte uint64_t for n follow) { uint64_t len; - return get_number(len) and get_cbor_object(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast(len)); } case 0xBF: // map (indefinite length) @@ -393,12 +394,12 @@ class binary_reader case 0xF9: // Half-Precision Float (two-byte IEEE 754) { const int byte1_raw = get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number"))) { return false; } const int byte2_raw = get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number"))) { return false; } @@ -441,19 +442,19 @@ class binary_reader case 0xFA: // Single-Precision Float (four-byte IEEE 754) { float number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::cbor, number) and sax->number_float(static_cast(number), ""); } case 0xFB: // Double-Precision Float (eight-byte IEEE 754) { double number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::cbor, number) and sax->number_float(static_cast(number), ""); } default: // anything else (0xFF is handled inside the other types) { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading CBOR; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"))); } } } @@ -467,7 +468,7 @@ class binary_reader { // EOF case std::char_traits::eof(): - return unexpect_eof(); + return unexpect_eof(input_format_t::msgpack, "value"); // positive fixint case 0x00: @@ -688,61 +689,61 @@ class binary_reader case 0xCA: // float 32 { float number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast(number), ""); } case 0xCB: // float 64 { double number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast(number), ""); } case 0xCC: // uint 8 { uint8_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number); } case 0xCD: // uint 16 { uint16_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number); } case 0xCE: // uint 32 { uint32_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number); } case 0xCF: // uint 64 { uint64_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number); } case 0xD0: // int 8 { int8_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::msgpack, number) and sax->number_integer(number); } case 0xD1: // int 16 { int16_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::msgpack, number) and sax->number_integer(number); } case 0xD2: // int 32 { int32_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::msgpack, number) and sax->number_integer(number); } case 0xD3: // int 64 { int64_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::msgpack, number) and sax->number_integer(number); } case 0xD9: // str 8 @@ -756,25 +757,25 @@ class binary_reader case 0xDC: // array 16 { uint16_t len; - return get_number(len) and get_msgpack_array(static_cast(len)); + return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast(len)); } case 0xDD: // array 32 { uint32_t len; - return get_number(len) and get_msgpack_array(static_cast(len)); + return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast(len)); } case 0xDE: // map 16 { uint16_t len; - return get_number(len) and get_msgpack_object(static_cast(len)); + return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast(len)); } case 0xDF: // map 32 { uint32_t len; - return get_number(len) and get_msgpack_object(static_cast(len)); + return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast(len)); } // negative fixint @@ -815,7 +816,7 @@ class binary_reader default: // anything else { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading MessagePack; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"))); } } } @@ -865,6 +866,7 @@ class binary_reader @brief read a number from the input @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) @param[out] result number of type @a NumberType @return whether conversion completed @@ -874,14 +876,14 @@ class binary_reader (big endian) and therefore need reordering on little endian systems. */ template - bool get_number(NumberType& result) + bool get_number(const input_format_t format, NumberType& result) { // step 1: read input into array with system's byte order std::array vec; for (std::size_t i = 0; i < sizeof(NumberType); ++i) { get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(format, "number"))) { return false; } @@ -906,8 +908,9 @@ class binary_reader @brief create a string by reading characters from the input @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) @param[in] len number of characters to read - @param[out] string created by reading @a len bytes + @param[out] result string created by reading @a len bytes @return whether string creation completed @@ -916,13 +919,13 @@ class binary_reader the input before we run out of string memory. */ template - bool get_string(const NumberType len, string_t& result) + bool get_string(const input_format_t format, const NumberType len, string_t& result) { bool success = true; - std::generate_n(std::back_inserter(result), len, [this, &success]() + std::generate_n(std::back_inserter(result), len, [this, &success, &format]() { get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(format, "string"))) { success = false; } @@ -944,7 +947,7 @@ class binary_reader */ bool get_cbor_string(string_t& result) { - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string"))) { return false; } @@ -977,31 +980,31 @@ class binary_reader case 0x76: case 0x77: { - return get_string(current & 0x1F, result); + return get_string(input_format_t::cbor, current & 0x1F, result); } case 0x78: // UTF-8 string (one-byte uint8_t for n follows) { uint8_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); } case 0x79: // UTF-8 string (two-byte uint16_t for n follow) { uint16_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); } case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) { uint32_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); } case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) { uint64_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); } case 0x7F: // UTF-8 string (indefinite length) @@ -1021,7 +1024,7 @@ class binary_reader default: { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a CBOR string; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"))); } } } @@ -1124,7 +1127,7 @@ class binary_reader */ bool get_msgpack_string(string_t& result) { - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::msgpack, "string"))) { return false; } @@ -1165,31 +1168,31 @@ class binary_reader case 0xBE: case 0xBF: { - return get_string(current & 0x1F, result); + return get_string(input_format_t::msgpack, current & 0x1F, result); } case 0xD9: // str 8 { uint8_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result); } case 0xDA: // str 16 { uint16_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result); } case 0xDB: // str 32 { uint32_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result); } default: { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a MessagePack string; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"))); } } } @@ -1267,7 +1270,7 @@ class binary_reader get(); // TODO: may we ignore N here? } - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value"))) { return false; } @@ -1277,36 +1280,36 @@ class binary_reader case 'U': { uint8_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } case 'i': { int8_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } case 'I': { int16_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } case 'l': { int32_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } case 'L': { int64_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } default: auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a UBJSON string; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"))); } } @@ -1321,7 +1324,7 @@ class binary_reader case 'U': { uint8_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -1332,7 +1335,7 @@ class binary_reader case 'i': { int8_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -1343,7 +1346,7 @@ class binary_reader case 'I': { int16_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -1354,7 +1357,7 @@ class binary_reader case 'l': { int32_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -1365,7 +1368,7 @@ class binary_reader case 'L': { int64_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -1376,7 +1379,7 @@ class binary_reader default: { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "byte after '#' must denote a number type; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"))); } } } @@ -1401,7 +1404,7 @@ class binary_reader if (current == '$') { result.second = get(); // must not ignore 'N', because 'N' maybe the type - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "type"))) { return false; } @@ -1409,12 +1412,12 @@ class binary_reader get_ignore_noop(); if (JSON_UNLIKELY(current != '#')) { - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value"))) { return false; } auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "expected '#' after UBJSON type information; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"))); } return get_ubjson_size_value(result.first); @@ -1435,7 +1438,7 @@ class binary_reader switch (prefix) { case std::char_traits::eof(): // EOF - return unexpect_eof(); + return unexpect_eof(input_format_t::ubjson, "value"); case 'T': // true return sax->boolean(true); @@ -1448,56 +1451,56 @@ class binary_reader case 'U': { uint8_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::ubjson, number) and sax->number_unsigned(number); } case 'i': { int8_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::ubjson, number) and sax->number_integer(number); } case 'I': { int16_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::ubjson, number) and sax->number_integer(number); } case 'l': { int32_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::ubjson, number) and sax->number_integer(number); } case 'L': { int64_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::ubjson, number) and sax->number_integer(number); } case 'd': { float number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast(number), ""); } case 'D': { double number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast(number), ""); } case 'C': // char { get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "char"))) { return false; } if (JSON_UNLIKELY(current > 127)) { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"))); } string_t s(1, static_cast(current)); return sax->string(s); @@ -1518,7 +1521,7 @@ class binary_reader default: // anything else { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading UBJSON; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"))); } } } @@ -1661,13 +1664,16 @@ class binary_reader } /*! + @param[in] format the current format (for diagnostics) + @param[in] context further context information (for diagnostics) @return whether the last read character is not EOF */ - bool unexpect_eof() const + bool unexpect_eof(const input_format_t format, const char* context) const { if (JSON_UNLIKELY(current == std::char_traits::eof())) { - return sax->parse_error(chars_read, "", parse_error::create(110, chars_read, "unexpected end of input")); + return sax->parse_error(chars_read, "", + parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context))); } return true; } @@ -1683,6 +1689,41 @@ class binary_reader } private: + /*! + @param[in] format the current format + @param[in] detail a detailed error message + @param[in] context further contect information + @return a message string to use in the parse_error exceptions + */ + std::string exception_message(const input_format_t format, + const std::string& detail, + const std::string& context) const + { + std::string error_msg = "syntax error while parsing "; + + switch (format) + { + case input_format_t::cbor: + error_msg += "CBOR"; + break; + + case input_format_t::msgpack: + error_msg += "MessagePack"; + break; + + case input_format_t::ubjson: + error_msg += "UBJSON"; + break; + + // LCOV_EXCL_START + default: + assert(false); + // LCOV_EXCL_STOP + } + + return error_msg + " " + context + ": " + detail; + } + /// input adapter input_adapter_t ia = nullptr; diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index b93dc6a3..d4b5e98f 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -767,7 +767,7 @@ class binary_writer } else { - JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(n))); + JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64")); } } @@ -821,7 +821,7 @@ class binary_writer // LCOV_EXCL_START else { - JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(n))); + JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64")); } // LCOV_EXCL_STOP } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index dc206d30..f744366c 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6297,7 +6297,8 @@ class binary_reader if (JSON_UNLIKELY(current != std::char_traits::eof())) { - return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read, "expected end of input")); + return sax->parse_error(chars_read, get_token_string(), + parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"))); } } @@ -6330,7 +6331,7 @@ class binary_reader { // EOF case std::char_traits::eof(): - return unexpect_eof(); + return unexpect_eof(input_format_t::cbor, "value"); // Integer 0x00..0x17 (0..23) case 0x00: @@ -6362,25 +6363,25 @@ class binary_reader case 0x18: // Unsigned integer (one-byte uint8_t follows) { uint8_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::cbor, number) and sax->number_unsigned(number); } case 0x19: // Unsigned integer (two-byte uint16_t follows) { uint16_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::cbor, number) and sax->number_unsigned(number); } case 0x1A: // Unsigned integer (four-byte uint32_t follows) { uint32_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::cbor, number) and sax->number_unsigned(number); } case 0x1B: // Unsigned integer (eight-byte uint64_t follows) { uint64_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::cbor, number) and sax->number_unsigned(number); } // Negative integer -1-0x00..-1-0x17 (-1..-24) @@ -6413,25 +6414,25 @@ class binary_reader case 0x38: // Negative integer (one-byte uint8_t follows) { uint8_t number; - return get_number(number) and sax->number_integer(static_cast(-1) - number); + return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast(-1) - number); } case 0x39: // Negative integer -1-n (two-byte uint16_t follows) { uint16_t number; - return get_number(number) and sax->number_integer(static_cast(-1) - number); + return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast(-1) - number); } case 0x3A: // Negative integer -1-n (four-byte uint32_t follows) { uint32_t number; - return get_number(number) and sax->number_integer(static_cast(-1) - number); + return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast(-1) - number); } case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows) { uint64_t number; - return get_number(number) and sax->number_integer(static_cast(-1) + return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast(-1) - static_cast(number)); } @@ -6500,25 +6501,25 @@ class binary_reader case 0x98: // array (one-byte uint8_t for n follows) { uint8_t len; - return get_number(len) and get_cbor_array(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast(len)); } case 0x99: // array (two-byte uint16_t for n follow) { uint16_t len; - return get_number(len) and get_cbor_array(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast(len)); } case 0x9A: // array (four-byte uint32_t for n follow) { uint32_t len; - return get_number(len) and get_cbor_array(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast(len)); } case 0x9B: // array (eight-byte uint64_t for n follow) { uint64_t len; - return get_number(len) and get_cbor_array(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast(len)); } case 0x9F: // array (indefinite length) @@ -6554,25 +6555,25 @@ class binary_reader case 0xB8: // map (one-byte uint8_t for n follows) { uint8_t len; - return get_number(len) and get_cbor_object(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast(len)); } case 0xB9: // map (two-byte uint16_t for n follow) { uint16_t len; - return get_number(len) and get_cbor_object(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast(len)); } case 0xBA: // map (four-byte uint32_t for n follow) { uint32_t len; - return get_number(len) and get_cbor_object(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast(len)); } case 0xBB: // map (eight-byte uint64_t for n follow) { uint64_t len; - return get_number(len) and get_cbor_object(static_cast(len)); + return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast(len)); } case 0xBF: // map (indefinite length) @@ -6590,12 +6591,12 @@ class binary_reader case 0xF9: // Half-Precision Float (two-byte IEEE 754) { const int byte1_raw = get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number"))) { return false; } const int byte2_raw = get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number"))) { return false; } @@ -6638,19 +6639,19 @@ class binary_reader case 0xFA: // Single-Precision Float (four-byte IEEE 754) { float number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::cbor, number) and sax->number_float(static_cast(number), ""); } case 0xFB: // Double-Precision Float (eight-byte IEEE 754) { double number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::cbor, number) and sax->number_float(static_cast(number), ""); } default: // anything else (0xFF is handled inside the other types) { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading CBOR; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"))); } } } @@ -6664,7 +6665,7 @@ class binary_reader { // EOF case std::char_traits::eof(): - return unexpect_eof(); + return unexpect_eof(input_format_t::msgpack, "value"); // positive fixint case 0x00: @@ -6885,61 +6886,61 @@ class binary_reader case 0xCA: // float 32 { float number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast(number), ""); } case 0xCB: // float 64 { double number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast(number), ""); } case 0xCC: // uint 8 { uint8_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number); } case 0xCD: // uint 16 { uint16_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number); } case 0xCE: // uint 32 { uint32_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number); } case 0xCF: // uint 64 { uint64_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number); } case 0xD0: // int 8 { int8_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::msgpack, number) and sax->number_integer(number); } case 0xD1: // int 16 { int16_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::msgpack, number) and sax->number_integer(number); } case 0xD2: // int 32 { int32_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::msgpack, number) and sax->number_integer(number); } case 0xD3: // int 64 { int64_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::msgpack, number) and sax->number_integer(number); } case 0xD9: // str 8 @@ -6953,25 +6954,25 @@ class binary_reader case 0xDC: // array 16 { uint16_t len; - return get_number(len) and get_msgpack_array(static_cast(len)); + return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast(len)); } case 0xDD: // array 32 { uint32_t len; - return get_number(len) and get_msgpack_array(static_cast(len)); + return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast(len)); } case 0xDE: // map 16 { uint16_t len; - return get_number(len) and get_msgpack_object(static_cast(len)); + return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast(len)); } case 0xDF: // map 32 { uint32_t len; - return get_number(len) and get_msgpack_object(static_cast(len)); + return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast(len)); } // negative fixint @@ -7012,7 +7013,7 @@ class binary_reader default: // anything else { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading MessagePack; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"))); } } } @@ -7062,6 +7063,7 @@ class binary_reader @brief read a number from the input @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) @param[out] result number of type @a NumberType @return whether conversion completed @@ -7071,14 +7073,14 @@ class binary_reader (big endian) and therefore need reordering on little endian systems. */ template - bool get_number(NumberType& result) + bool get_number(const input_format_t format, NumberType& result) { // step 1: read input into array with system's byte order std::array vec; for (std::size_t i = 0; i < sizeof(NumberType); ++i) { get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(format, "number"))) { return false; } @@ -7103,8 +7105,9 @@ class binary_reader @brief create a string by reading characters from the input @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) @param[in] len number of characters to read - @param[out] string created by reading @a len bytes + @param[out] result string created by reading @a len bytes @return whether string creation completed @@ -7113,13 +7116,13 @@ class binary_reader the input before we run out of string memory. */ template - bool get_string(const NumberType len, string_t& result) + bool get_string(const input_format_t format, const NumberType len, string_t& result) { bool success = true; - std::generate_n(std::back_inserter(result), len, [this, &success]() + std::generate_n(std::back_inserter(result), len, [this, &success, &format]() { get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(format, "string"))) { success = false; } @@ -7141,7 +7144,7 @@ class binary_reader */ bool get_cbor_string(string_t& result) { - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string"))) { return false; } @@ -7174,31 +7177,31 @@ class binary_reader case 0x76: case 0x77: { - return get_string(current & 0x1F, result); + return get_string(input_format_t::cbor, current & 0x1F, result); } case 0x78: // UTF-8 string (one-byte uint8_t for n follows) { uint8_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); } case 0x79: // UTF-8 string (two-byte uint16_t for n follow) { uint16_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); } case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) { uint32_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); } case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) { uint64_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); } case 0x7F: // UTF-8 string (indefinite length) @@ -7218,7 +7221,7 @@ class binary_reader default: { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a CBOR string; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"))); } } } @@ -7321,7 +7324,7 @@ class binary_reader */ bool get_msgpack_string(string_t& result) { - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::msgpack, "string"))) { return false; } @@ -7362,31 +7365,31 @@ class binary_reader case 0xBE: case 0xBF: { - return get_string(current & 0x1F, result); + return get_string(input_format_t::msgpack, current & 0x1F, result); } case 0xD9: // str 8 { uint8_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result); } case 0xDA: // str 16 { uint16_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result); } case 0xDB: // str 32 { uint32_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result); } default: { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a MessagePack string; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"))); } } } @@ -7464,7 +7467,7 @@ class binary_reader get(); // TODO: may we ignore N here? } - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value"))) { return false; } @@ -7474,36 +7477,36 @@ class binary_reader case 'U': { uint8_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } case 'i': { int8_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } case 'I': { int16_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } case 'l': { int32_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } case 'L': { int64_t len; - return get_number(len) and get_string(len, result); + return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result); } default: auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "expected a UBJSON string; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"))); } } @@ -7518,7 +7521,7 @@ class binary_reader case 'U': { uint8_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -7529,7 +7532,7 @@ class binary_reader case 'i': { int8_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -7540,7 +7543,7 @@ class binary_reader case 'I': { int16_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -7551,7 +7554,7 @@ class binary_reader case 'l': { int32_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -7562,7 +7565,7 @@ class binary_reader case 'L': { int64_t number; - if (JSON_UNLIKELY(not get_number(number))) + if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number))) { return false; } @@ -7573,7 +7576,7 @@ class binary_reader default: { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "byte after '#' must denote a number type; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"))); } } } @@ -7598,7 +7601,7 @@ class binary_reader if (current == '$') { result.second = get(); // must not ignore 'N', because 'N' maybe the type - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "type"))) { return false; } @@ -7606,12 +7609,12 @@ class binary_reader get_ignore_noop(); if (JSON_UNLIKELY(current != '#')) { - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value"))) { return false; } auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "expected '#' after UBJSON type information; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"))); } return get_ubjson_size_value(result.first); @@ -7632,7 +7635,7 @@ class binary_reader switch (prefix) { case std::char_traits::eof(): // EOF - return unexpect_eof(); + return unexpect_eof(input_format_t::ubjson, "value"); case 'T': // true return sax->boolean(true); @@ -7645,56 +7648,56 @@ class binary_reader case 'U': { uint8_t number; - return get_number(number) and sax->number_unsigned(number); + return get_number(input_format_t::ubjson, number) and sax->number_unsigned(number); } case 'i': { int8_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::ubjson, number) and sax->number_integer(number); } case 'I': { int16_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::ubjson, number) and sax->number_integer(number); } case 'l': { int32_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::ubjson, number) and sax->number_integer(number); } case 'L': { int64_t number; - return get_number(number) and sax->number_integer(number); + return get_number(input_format_t::ubjson, number) and sax->number_integer(number); } case 'd': { float number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast(number), ""); } case 'D': { double number; - return get_number(number) and sax->number_float(static_cast(number), ""); + return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast(number), ""); } case 'C': // char { get(); - if (JSON_UNLIKELY(not unexpect_eof())) + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "char"))) { return false; } if (JSON_UNLIKELY(current > 127)) { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"))); } string_t s(1, static_cast(current)); return sax->string(s); @@ -7715,7 +7718,7 @@ class binary_reader default: // anything else { auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, "error reading UBJSON; last byte: 0x" + last_token)); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"))); } } } @@ -7858,13 +7861,16 @@ class binary_reader } /*! + @param[in] format the current format (for diagnostics) + @param[in] context further context information (for diagnostics) @return whether the last read character is not EOF */ - bool unexpect_eof() const + bool unexpect_eof(const input_format_t format, const char* context) const { if (JSON_UNLIKELY(current == std::char_traits::eof())) { - return sax->parse_error(chars_read, "", parse_error::create(110, chars_read, "unexpected end of input")); + return sax->parse_error(chars_read, "", + parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context))); } return true; } @@ -7880,6 +7886,41 @@ class binary_reader } private: + /*! + @param[in] format the current format + @param[in] detail a detailed error message + @param[in] context further contect information + @return a message string to use in the parse_error exceptions + */ + std::string exception_message(const input_format_t format, + const std::string& detail, + const std::string& context) const + { + std::string error_msg = "syntax error while parsing "; + + switch (format) + { + case input_format_t::cbor: + error_msg += "CBOR"; + break; + + case input_format_t::msgpack: + error_msg += "MessagePack"; + break; + + case input_format_t::ubjson: + error_msg += "UBJSON"; + break; + + // LCOV_EXCL_START + default: + assert(false); + // LCOV_EXCL_STOP + } + + return error_msg + " " + context + ": " + detail; + } + /// input adapter input_adapter_t ia = nullptr; @@ -8670,7 +8711,7 @@ class binary_writer } else { - JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(n))); + JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64")); } } @@ -8724,7 +8765,7 @@ class binary_writer // LCOV_EXCL_START else { - JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(n))); + JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64")); } // LCOV_EXCL_STOP } diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp index 62520a0b..d7f52ed8 100644 --- a/test/src/unit-cbor.cpp +++ b/test/src/unit-cbor.cpp @@ -831,14 +831,14 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(std::vector({0xf9})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xf9})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input"); CHECK(json::from_cbor(std::vector({0xf9}), true, false).is_discarded()); } SECTION("only one byte follows") { CHECK_THROWS_AS(json::from_cbor(std::vector({0xf9, 0x7c})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xf9, 0x7c})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input"); CHECK(json::from_cbor(std::vector({0xf9, 0x7c}), true, false).is_discarded()); } } @@ -1314,7 +1314,7 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(std::vector()), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector()), - "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing CBOR value: unexpected end of input"); CHECK(json::from_cbor(std::vector(), true, false).is_discarded()); } @@ -1346,53 +1346,53 @@ TEST_CASE("CBOR") CHECK_THROWS_AS(json::from_cbor(std::vector({0xBF, 0x61, 0X61})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x18})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x19})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x19, 0x00})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1a})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1a, 0x00})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1a, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1a, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 6: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 7: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 9: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing CBOR number: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x62})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x62, 0x60})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR string: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x7F})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x7F, 0x60})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR string: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x82, 0x01})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x9F, 0x01})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xBF, 0x61, 0x61, 0xF5})), - "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR string: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xA1, 0x61, 0x61})), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR value: unexpected end of input"); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xBF, 0x61, 0x61})), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR value: unexpected end of input"); CHECK(json::from_cbor(std::vector({0x18}), true, false).is_discarded()); CHECK(json::from_cbor(std::vector({0x19}), true, false).is_discarded()); @@ -1426,12 +1426,12 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(std::vector({0x1c})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0x1c})), - "[json.exception.parse_error.112] parse error at byte 1: error reading CBOR; last byte: 0x1C"); + "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing CBOR value: invalid byte: 0x1C"); CHECK(json::from_cbor(std::vector({0x1c}), true, false).is_discarded()); CHECK_THROWS_AS(json::from_cbor(std::vector({0xf8})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xf8})), - "[json.exception.parse_error.112] parse error at byte 1: error reading CBOR; last byte: 0xF8"); + "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing CBOR value: invalid byte: 0xF8"); CHECK(json::from_cbor(std::vector({0xf8}), true, false).is_discarded()); } @@ -1491,7 +1491,7 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(std::vector({0xa1, 0xff, 0x01})), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(std::vector({0xa1, 0xff, 0x01})), - "[json.exception.parse_error.113] parse error at byte 2: expected a CBOR string; last byte: 0xFF"); + "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xFF"); CHECK(json::from_cbor(std::vector({0xa1, 0xff, 0x01}), true, false).is_discarded()); } @@ -1509,7 +1509,7 @@ TEST_CASE("CBOR") { CHECK_THROWS_AS(json::from_cbor(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec), - "[json.exception.parse_error.110] parse error at byte 2: expected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR value: expected end of input; last byte: 0xF6"); CHECK(json::from_cbor(vec, true, false).is_discarded()); } } diff --git a/test/src/unit-msgpack.cpp b/test/src/unit-msgpack.cpp index f75cedce..26d07963 100644 --- a/test/src/unit-msgpack.cpp +++ b/test/src/unit-msgpack.cpp @@ -1124,7 +1124,7 @@ TEST_CASE("MessagePack") { CHECK_THROWS_AS(json::from_msgpack(std::vector()), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector()), - "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing MessagePack value: unexpected end of input"); CHECK(json::from_msgpack(std::vector(), true, false).is_discarded()); } @@ -1151,43 +1151,43 @@ TEST_CASE("MessagePack") CHECK_THROWS_AS(json::from_msgpack(std::vector({0x81, 0xa1, 0x61})), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0x87})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack string: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcc})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcd})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcd, 0x00})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xce})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xce, 0x00})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xce, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xce, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf})), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 6: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 7: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})), - "[json.exception.parse_error.110] parse error at byte 9: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing MessagePack number: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xa5, 0x68, 0x65})), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack string: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0x92, 0x01})), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing MessagePack value: unexpected end of input"); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0x81, 0xa1, 0x61})), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack value: unexpected end of input"); CHECK(json::from_msgpack(std::vector({0x87}), true, false).is_discarded()); CHECK(json::from_msgpack(std::vector({0xcc}), true, false).is_discarded()); @@ -1216,12 +1216,12 @@ TEST_CASE("MessagePack") { CHECK_THROWS_AS(json::from_msgpack(std::vector({0xc1})), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xc1})), - "[json.exception.parse_error.112] parse error at byte 1: error reading MessagePack; last byte: 0xC1"); + "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing MessagePack value: invalid byte: 0xC1"); CHECK(json::from_msgpack(std::vector({0xc6}), true, false).is_discarded()); CHECK_THROWS_AS(json::from_msgpack(std::vector({0xc6})), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0xc6})), - "[json.exception.parse_error.112] parse error at byte 1: error reading MessagePack; last byte: 0xC6"); + "[json.exception.parse_error.112] parse error at byte 1: syntax error while parsing MessagePack value: invalid byte: 0xC6"); CHECK(json::from_msgpack(std::vector({0xc6}), true, false).is_discarded()); } @@ -1249,7 +1249,7 @@ TEST_CASE("MessagePack") { CHECK_THROWS_AS(json::from_msgpack(std::vector({0x81, 0xff, 0x01})), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(std::vector({0x81, 0xff, 0x01})), - "[json.exception.parse_error.113] parse error at byte 2: expected a MessagePack string; last byte: 0xFF"); + "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing MessagePack string: expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0xFF"); CHECK(json::from_msgpack(std::vector({0x81, 0xff, 0x01}), true, false).is_discarded()); } @@ -1266,7 +1266,7 @@ TEST_CASE("MessagePack") { CHECK_THROWS_AS(json::from_msgpack(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec), - "[json.exception.parse_error.110] parse error at byte 2: expected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack value: expected end of input; last byte: 0xC0"); CHECK(json::from_msgpack(vec, true, false).is_discarded()); } } diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index 98a53a50..259377aa 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -930,7 +930,7 @@ TEST_CASE("regression tests") std::vector vec {0x65, 0xf5, 0x0a, 0x48, 0x21}; CHECK_THROWS_AS(json::from_cbor(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec), - "[json.exception.parse_error.110] parse error at byte 6: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing CBOR string: unexpected end of input"); } SECTION("issue #407 - Heap-buffer-overflow (OSS-Fuzz issue 343)") @@ -939,31 +939,31 @@ TEST_CASE("regression tests") std::vector vec1 {0xcb, 0x8f, 0x0a}; CHECK_THROWS_AS(json::from_msgpack(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec1), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input"); // related test case: incomplete float32 std::vector vec2 {0xca, 0x8f, 0x0a}; CHECK_THROWS_AS(json::from_msgpack(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec2), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing MessagePack number: unexpected end of input"); // related test case: incomplete Half-Precision Float (CBOR) std::vector vec3 {0xf9, 0x8f}; CHECK_THROWS_AS(json::from_cbor(vec3), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec3), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR number: unexpected end of input"); // related test case: incomplete Single-Precision Float (CBOR) std::vector vec4 {0xfa, 0x8f, 0x0a}; CHECK_THROWS_AS(json::from_cbor(vec4), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec4), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input"); // related test case: incomplete Double-Precision Float (CBOR) std::vector vec5 {0xfb, 0x8f, 0x0a}; CHECK_THROWS_AS(json::from_cbor(vec5), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec5), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR number: unexpected end of input"); } SECTION("issue #408 - Heap-buffer-overflow (OSS-Fuzz issue 344)") @@ -972,7 +972,7 @@ TEST_CASE("regression tests") std::vector vec1 {0x87}; CHECK_THROWS_AS(json::from_msgpack(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec1), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing MessagePack string: unexpected end of input"); // more test cases for MessagePack for (auto b : @@ -1006,10 +1006,10 @@ TEST_CASE("regression tests") std::vector vec2; CHECK_THROWS_AS(json::from_cbor(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec2), - "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing CBOR value: unexpected end of input"); CHECK_THROWS_AS(json::from_msgpack(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_msgpack(vec2), - "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing MessagePack value: unexpected end of input"); } SECTION("issue #411 - Heap-buffer-overflow (OSS-Fuzz issue 366)") @@ -1018,19 +1018,19 @@ TEST_CASE("regression tests") std::vector vec1 {0x7f}; CHECK_THROWS_AS(json::from_cbor(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec1), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input"); // related test case: empty array (indefinite length) std::vector vec2 {0x9f}; CHECK_THROWS_AS(json::from_cbor(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec2), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR value: unexpected end of input"); // related test case: empty map (indefinite length) std::vector vec3 {0xbf}; CHECK_THROWS_AS(json::from_cbor(vec3), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec3), - "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing CBOR string: unexpected end of input"); } SECTION("issue #412 - Heap-buffer-overflow (OSS-Fuzz issue 367)") @@ -1058,25 +1058,25 @@ TEST_CASE("regression tests") }; CHECK_THROWS_AS(json::from_cbor(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec), - "[json.exception.parse_error.113] parse error at byte 2: expected a CBOR string; last byte: 0x98"); + "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x98"); // related test case: nonempty UTF-8 string (indefinite length) std::vector vec1 {0x7f, 0x61, 0x61}; CHECK_THROWS_AS(json::from_cbor(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec1), - "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing CBOR string: unexpected end of input"); // related test case: nonempty array (indefinite length) std::vector vec2 {0x9f, 0x01}; CHECK_THROWS_AS(json::from_cbor(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec2), - "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing CBOR value: unexpected end of input"); // related test case: nonempty map (indefinite length) std::vector vec3 {0xbf, 0x61, 0x61, 0x01}; CHECK_THROWS_AS(json::from_cbor(vec3), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec3), - "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing CBOR string: unexpected end of input"); } SECTION("issue #414 - compare with literal 0)") @@ -1111,7 +1111,7 @@ TEST_CASE("regression tests") }; CHECK_THROWS_AS(json::from_cbor(vec1), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec1), - "[json.exception.parse_error.113] parse error at byte 13: expected a CBOR string; last byte: 0xB4"); + "[json.exception.parse_error.113] parse error at byte 13: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xB4"); // related test case: double-precision std::vector vec2 @@ -1125,7 +1125,7 @@ TEST_CASE("regression tests") }; CHECK_THROWS_AS(json::from_cbor(vec2), json::parse_error&); CHECK_THROWS_WITH(json::from_cbor(vec2), - "[json.exception.parse_error.113] parse error at byte 13: expected a CBOR string; last byte: 0xB4"); + "[json.exception.parse_error.113] parse error at byte 13: syntax error while parsing CBOR string: expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0xB4"); } SECTION("issue #452 - Heap-buffer-overflow (OSS-Fuzz issue 585)") diff --git a/test/src/unit-ubjson.cpp b/test/src/unit-ubjson.cpp index d2410ff6..ba0d23da 100644 --- a/test/src/unit-ubjson.cpp +++ b/test/src/unit-ubjson.cpp @@ -1299,7 +1299,7 @@ TEST_CASE("UBJSON") { CHECK_THROWS_AS(json::from_ubjson(vec), json::parse_error&); CHECK_THROWS_WITH(json::from_ubjson(vec), - "[json.exception.parse_error.110] parse error at byte 2: expected end of input"); + "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: expected end of input; last byte: 0x5A"); } } @@ -1308,7 +1308,7 @@ TEST_CASE("UBJSON") // larger than max int64 json j = 9223372036854775808llu; CHECK_THROWS_AS(json::to_ubjson(j), json::out_of_range&); - CHECK_THROWS_WITH(json::to_ubjson(j), "[json.exception.out_of_range.407] number overflow serializing 9223372036854775808"); + CHECK_THROWS_WITH(json::to_ubjson(j), "[json.exception.out_of_range.407] integer number 9223372036854775808 cannot be represented by UBJSON as it does not fit int64"); } SECTION("excessive size") @@ -1529,7 +1529,7 @@ TEST_CASE("UBJSON") { CHECK_THROWS_AS(json::from_ubjson(std::vector()), json::parse_error&); CHECK_THROWS_WITH(json::from_ubjson(std::vector()), - "[json.exception.parse_error.110] parse error at byte 1: unexpected end of input"); + "[json.exception.parse_error.110] parse error at byte 1: syntax error while parsing UBJSON value: unexpected end of input"); } SECTION("char") @@ -1538,14 +1538,14 @@ TEST_CASE("UBJSON") { std::vector v = {'C'}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON char: unexpected end of input"); } SECTION("byte out of range") { std::vector v = {'C', 130}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: byte after 'C' must be in range 0x00..0x7F; last byte: 0x82"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON char: byte after 'C' must be in range 0x00..0x7F; last byte: 0x82"); } } @@ -1555,14 +1555,14 @@ TEST_CASE("UBJSON") { std::vector v = {'S'}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: unexpected end of input"); } SECTION("invalid byte") { std::vector v = {'S', '1', 'a'}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: expected a UBJSON string; last byte: 0x31"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.113] parse error at byte 2: syntax error while parsing UBJSON string: expected length type specification (U, i, I, l, L); last byte: 0x31"); } } @@ -1572,7 +1572,7 @@ TEST_CASE("UBJSON") { std::vector v = {'[', '$', 'i', 2}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.112] parse error at byte 4: expected '#' after UBJSON type information; last byte: 0x02"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.112] parse error at byte 4: syntax error while parsing UBJSON size: expected '#' after type information; last byte: 0x02"); } } @@ -1580,17 +1580,17 @@ TEST_CASE("UBJSON") { std::vector vS = {'S'}; CHECK_THROWS_AS(json::from_ubjson(vS), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(vS, true, false).is_discarded()); std::vector v = {'S', 'i', '2', 'a'}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing UBJSON string: unexpected end of input"); CHECK(json::from_ubjson(v, true, false).is_discarded()); std::vector vC = {'C'}; CHECK_THROWS_AS(json::from_ubjson(vC), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vC), "[json.exception.parse_error.110] parse error at byte 2: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vC), "[json.exception.parse_error.110] parse error at byte 2: syntax error while parsing UBJSON char: unexpected end of input"); CHECK(json::from_ubjson(vC, true, false).is_discarded()); } @@ -1598,32 +1598,32 @@ TEST_CASE("UBJSON") { std::vector vU = {'[', '#', 'U'}; CHECK_THROWS_AS(json::from_ubjson(vU), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vU), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vU), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input"); CHECK(json::from_ubjson(vU, true, false).is_discarded()); std::vector vi = {'[', '#', 'i'}; CHECK_THROWS_AS(json::from_ubjson(vi), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input"); CHECK(json::from_ubjson(vi, true, false).is_discarded()); std::vector vI = {'[', '#', 'I'}; CHECK_THROWS_AS(json::from_ubjson(vI), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vI), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vI), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input"); CHECK(json::from_ubjson(vI, true, false).is_discarded()); std::vector vl = {'[', '#', 'l'}; CHECK_THROWS_AS(json::from_ubjson(vl), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vl), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vl), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input"); CHECK(json::from_ubjson(vl, true, false).is_discarded()); std::vector vL = {'[', '#', 'L'}; CHECK_THROWS_AS(json::from_ubjson(vL), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vL), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vL), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON number: unexpected end of input"); CHECK(json::from_ubjson(vL, true, false).is_discarded()); std::vector v0 = {'[', '#', 'T', ']'}; CHECK_THROWS_AS(json::from_ubjson(v0), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v0), "[json.exception.parse_error.113] parse error at byte 3: byte after '#' must denote a number type; last byte: 0x54"); + CHECK_THROWS_WITH(json::from_ubjson(v0), "[json.exception.parse_error.113] parse error at byte 3: syntax error while parsing UBJSON size: expected length type specification (U, i, I, l, L) after '#'; last byte: 0x54"); CHECK(json::from_ubjson(v0, true, false).is_discarded()); } @@ -1631,17 +1631,17 @@ TEST_CASE("UBJSON") { std::vector v0 = {'[', '$'}; CHECK_THROWS_AS(json::from_ubjson(v0), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v0), "[json.exception.parse_error.110] parse error at byte 3: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v0), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing UBJSON type: unexpected end of input"); CHECK(json::from_ubjson(v0, true, false).is_discarded()); std::vector vi = {'[', '$', '#'}; CHECK_THROWS_AS(json::from_ubjson(vi), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vi), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(vi, true, false).is_discarded()); std::vector vT = {'[', '$', 'T'}; CHECK_THROWS_AS(json::from_ubjson(vT), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vT), "[json.exception.parse_error.110] parse error at byte 4: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vT), "[json.exception.parse_error.110] parse error at byte 4: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(vT, true, false).is_discarded()); } @@ -1649,17 +1649,17 @@ TEST_CASE("UBJSON") { std::vector vST = {'[', '$', 'i', '#', 'i', 2, 1}; CHECK_THROWS_AS(json::from_ubjson(vST), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON number: unexpected end of input"); CHECK(json::from_ubjson(vST, true, false).is_discarded()); std::vector vS = {'[', '#', 'i', 2, 'i', 1}; CHECK_THROWS_AS(json::from_ubjson(vS), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 7: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(vS, true, false).is_discarded()); std::vector v = {'[', 'i', 2, 'i', 1}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 6: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(v, true, false).is_discarded()); } @@ -1667,42 +1667,42 @@ TEST_CASE("UBJSON") { std::vector vST = {'{', '$', 'i', '#', 'i', 2, 'i', 1, 'a', 1}; CHECK_THROWS_AS(json::from_ubjson(vST), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 11: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vST), "[json.exception.parse_error.110] parse error at byte 11: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(vST, true, false).is_discarded()); std::vector vT = {'{', '$', 'i', 'i', 1, 'a', 1}; CHECK_THROWS_AS(json::from_ubjson(vT), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vT), "[json.exception.parse_error.112] parse error at byte 4: expected '#' after UBJSON type information; last byte: 0x69"); + CHECK_THROWS_WITH(json::from_ubjson(vT), "[json.exception.parse_error.112] parse error at byte 4: syntax error while parsing UBJSON size: expected '#' after type information; last byte: 0x69"); CHECK(json::from_ubjson(vT, true, false).is_discarded()); std::vector vS = {'{', '#', 'i', 2, 'i', 1, 'a', 'i', 1}; CHECK_THROWS_AS(json::from_ubjson(vS), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 10: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vS), "[json.exception.parse_error.110] parse error at byte 10: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(vS, true, false).is_discarded()); std::vector v = {'{', 'i', 1, 'a', 'i', 1}; CHECK_THROWS_AS(json::from_ubjson(v), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 7: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v), "[json.exception.parse_error.110] parse error at byte 7: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(v, true, false).is_discarded()); std::vector v2 = {'{', 'i', 1, 'a', 'i', 1, 'i'}; CHECK_THROWS_AS(json::from_ubjson(v2), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v2), "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v2), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON number: unexpected end of input"); CHECK(json::from_ubjson(v2, true, false).is_discarded()); std::vector v3 = {'{', 'i', 1, 'a'}; CHECK_THROWS_AS(json::from_ubjson(v3), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(v3), "[json.exception.parse_error.110] parse error at byte 5: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(v3), "[json.exception.parse_error.110] parse error at byte 5: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(v3, true, false).is_discarded()); std::vector vST1 = {'{', '$', 'd', '#', 'i', 2, 'i', 1, 'a'}; CHECK_THROWS_AS(json::from_ubjson(vST1), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vST1), "[json.exception.parse_error.110] parse error at byte 10: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vST1), "[json.exception.parse_error.110] parse error at byte 10: syntax error while parsing UBJSON number: unexpected end of input"); CHECK(json::from_ubjson(vST1, true, false).is_discarded()); std::vector vST2 = {'{', '#', 'i', 2, 'i', 1, 'a'}; CHECK_THROWS_AS(json::from_ubjson(vST2), json::parse_error&); - CHECK_THROWS_WITH(json::from_ubjson(vST2), "[json.exception.parse_error.110] parse error at byte 8: unexpected end of input"); + CHECK_THROWS_WITH(json::from_ubjson(vST2), "[json.exception.parse_error.110] parse error at byte 8: syntax error while parsing UBJSON value: unexpected end of input"); CHECK(json::from_ubjson(vST2, true, false).is_discarded()); } } From f0c55ce0e01b2d1ecc5f270e53eed5bacdaf9b80 Mon Sep 17 00:00:00 2001 From: Kostiantyn Ponomarenko Date: Wed, 17 Oct 2018 21:37:08 +0300 Subject: [PATCH 41/77] Add Meson related info to README Add more information about how one can get a Meson wrap file. Signed-off-by: Kostiantyn Ponomarenko --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 926b4d7e..c73cf1f7 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ endif() :beer: If you are using OS X and [Homebrew](http://brew.sh), just type `brew tap nlohmann/json` and `brew install nlohmann_json` and you're set. If you want the bleeding edge rather than the latest release, use `brew install nlohmann_json --HEAD`. -If you are using the [Meson Build System](http://mesonbuild.com), then you can wrap this repository as a subproject. +If you are using the [Meson Build System](http://mesonbuild.com), then you can get a wrap file by downloading it from [Meson WrapDB](https://wrapdb.mesonbuild.com/nlohmann_json), or simply use `meson wrap install nlohmann_json`. If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add `jsonformoderncpp/x.y.z@vthiery/stable` to your `conanfile.py`'s requires, where `x.y.z` is the release version you want to use. Please file issues [here](https://github.com/vthiery/conan-jsonformoderncpp/issues) if you experience problems with the packages. From 8de10c518b28b2c2d9b79e84f49d8c5e53229407 Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Wed, 17 Oct 2018 21:47:01 +0200 Subject: [PATCH 42/77] BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find() --- include/nlohmann/detail/output/binary_writer.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 631acce2..f659476e 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -683,7 +683,7 @@ class binary_writer */ static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { - if (name.find(static_cast(0)) != BasicJsonType::string_t::npos) + if (name.find(static_cast(0)) != BasicJsonType::string_t::npos) { JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000")); } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 94a0be69..e739eb5c 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -8840,7 +8840,7 @@ class binary_writer */ static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { - if (name.find(static_cast(0)) != BasicJsonType::string_t::npos) + if (name.find(static_cast(0)) != BasicJsonType::string_t::npos) { JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000")); } From 5ba812d518e49d3952b2bc46e63c081ec3ca8e1a Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Thu, 18 Oct 2018 06:38:34 +0200 Subject: [PATCH 43/77] BSON: fixed incorrect casting in unit-bson.cpp --- test/src/unit-bson.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 13dfd52c..633dbd2e 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -869,7 +869,7 @@ TEST_CASE("BSON numerical data") }; CHECK(j.at("entry").is_number_integer()); - std::uint64_t iu = *reinterpret_cast(&i); + std::uint32_t iu = *reinterpret_cast(&i); std::vector expected_bson = { 0x10u, 0x00u, 0x00u, 0x00u, // size (little endian) From ad11b6c35ecebb3b4a22c8f5b814c37969160f7b Mon Sep 17 00:00:00 2001 From: Julian Becker Date: Thu, 18 Oct 2018 20:05:46 +0200 Subject: [PATCH 44/77] BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of `out_of_range.409`-message --- include/nlohmann/detail/exceptions.hpp | 2 +- .../nlohmann/detail/output/binary_writer.hpp | 6 ++-- single_include/nlohmann/json.hpp | 8 +++-- test/src/unit-bson.cpp | 31 +++++++++++++------ 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index 5b0420e2..1ac2606b 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -282,7 +282,7 @@ json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch op json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. | json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | -json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | +json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | @liveexample{The following code shows how an `out_of_range` exception can be caught.,out_of_range} diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index f659476e..bebfa936 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -683,9 +683,11 @@ class binary_writer */ static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { - if (name.find(static_cast(0)) != BasicJsonType::string_t::npos) + const auto it = name.find(static_cast(0)); + if (it != BasicJsonType::string_t::npos) { - JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000")); + JSON_THROW(out_of_range::create(409, + "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")")); } return /*id*/ 1ul + name.size() + /*zero-terminator*/1u; diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index e739eb5c..bbcef784 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -923,7 +923,7 @@ json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch op json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF. json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. | json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. | -json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | +json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string | @liveexample{The following code shows how an `out_of_range` exception can be caught.,out_of_range} @@ -8840,9 +8840,11 @@ class binary_writer */ static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { - if (name.find(static_cast(0)) != BasicJsonType::string_t::npos) + const auto it = name.find(static_cast(0)); + if (it != BasicJsonType::string_t::npos) { - JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000")); + JSON_THROW(out_of_range::create(409, + "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")")); } return /*id*/ 1ul + name.size() + /*zero-terminator*/1u; diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 633dbd2e..3449b698 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -48,7 +48,8 @@ TEST_CASE("BSON") SECTION("null") { json j = nullptr; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 0 cannot be serialized to requested format"); } SECTION("boolean") @@ -56,38 +57,44 @@ TEST_CASE("BSON") SECTION("true") { json j = true; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 4 cannot be serialized to requested format"); } SECTION("false") { json j = false; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 4 cannot be serialized to requested format"); } } SECTION("number") { json j = 42; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 5 cannot be serialized to requested format"); } SECTION("float") { json j = 4.2; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 7 cannot be serialized to requested format"); } SECTION("string") { json j = "not supported"; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 3 cannot be serialized to requested format"); } SECTION("array") { json j = std::vector {1, 2, 3, 4, 5, 6, 7}; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error); + REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 2 cannot be serialized to requested format"); } } @@ -97,8 +104,8 @@ TEST_CASE("BSON") { { std::string("en\0try", 6), true } }; - REQUIRE_THROWS_AS(json::to_bson(j), json::out_of_range); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.409] BSON key cannot contain code point U+0000"); + REQUIRE_THROWS_AS(json::to_bson(j), json::out_of_range&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.409] BSON key cannot contain code point U+0000 (at byte 2)"); } SECTION("objects") @@ -678,6 +685,7 @@ TEST_CASE("Incomplete BSON INPUT") 'e', 'n', 't' // unexpected EOF }; + CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); CHECK_THROWS_WITH(json::from_bson(incomplete_bson), "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing BSON cstring: unexpected end of input"); @@ -695,6 +703,7 @@ TEST_CASE("Incomplete BSON INPUT 2") 0x08, // entry: boolean, unexpected EOF }; + CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); CHECK_THROWS_WITH(json::from_bson(incomplete_bson), "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing BSON cstring: unexpected end of input"); CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); @@ -717,6 +726,8 @@ TEST_CASE("Incomplete BSON INPUT 3") 0x10, 0x00, 0x02, 0x00, 0x00, 0x00 // missing input data... }; + + CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); CHECK_THROWS_WITH(json::from_bson(incomplete_bson), "[json.exception.parse_error.110] parse error at byte 28: syntax error while parsing BSON element list: unexpected end of input"); CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); @@ -734,6 +745,7 @@ TEST_CASE("Incomplete BSON INPUT 4") 0x0D, 0x00, // size (incomplete), unexpected EOF }; + CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); CHECK_THROWS_WITH(json::from_bson(incomplete_bson), "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing BSON number: unexpected end of input"); CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); @@ -753,6 +765,7 @@ TEST_CASE("Unsupported BSON input") 0x00 // end marker }; + CHECK_THROWS_AS(json::from_bson(bson), json::parse_error&); CHECK_THROWS_WITH(json::from_bson(bson), "[json.exception.parse_error.114] parse error at byte 5: Unsupported BSON record type 0xFF"); CHECK(json::from_bson(bson, true, false).is_discarded()); From c5821d91e51f9f2b233689e3f7d3f274cc8d27fc Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 21 Oct 2018 11:49:37 +0200 Subject: [PATCH 45/77] :construction: overworked error handlers #1198 --- include/nlohmann/detail/output/serializer.hpp | 88 ++++++++++----- include/nlohmann/json.hpp | 17 ++- single_include/nlohmann/json.hpp | 105 ++++++++++++------ test/src/unit-serialization.cpp | 37 ++++++ 4 files changed, 181 insertions(+), 66 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 7adf0c2f..3ccca482 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -28,6 +28,14 @@ namespace detail // serialization // /////////////////// +/// how to treat decoding errors +enum class error_handler_t +{ + strict, ///< throw a type_error exception in case of invalid UTF-8 + replace, ///< replace invalid UTF-8 sequences with U+FFFD + ignore ///< ignore invalid UTF-8 sequences +}; + template class serializer { @@ -39,23 +47,20 @@ class serializer static constexpr uint8_t UTF8_REJECT = 1; public: - /// how to treat decoding errors - enum class error_handler_t - { - strict, ///< throw a type_error exception in case of invalid UTF-8 - replace, ///< replace invalid UTF-8 sequences with U+FFFD - ignore ///< ignore invalid UTF-8 sequences - }; - /*! @param[in] s output stream to serialize to @param[in] ichar indentation character to use + @param[in] error_handler_ how to react on decoding errors */ - serializer(output_adapter_t s, const char ichar) - : o(std::move(s)), loc(std::localeconv()), - thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep)), - decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point)), - indent_char(ichar), indent_string(512, indent_char) + serializer(output_adapter_t s, const char ichar, + error_handler_t error_handler_ = error_handler_t::strict) + : o(std::move(s)) + , loc(std::localeconv()) + , thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep)) + , decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point)) + , indent_char(ichar) + , indent_string(512, indent_char) + , error_handler(error_handler_) {} // delete because of pointer members @@ -286,17 +291,18 @@ class serializer @param[in] s the string to escape @param[in] ensure_ascii whether to escape non-ASCII characters with \uXXXX sequences - @param[in] error_handler how to react on decoding errors @complexity Linear in the length of string @a s. */ - void dump_escaped(const string_t& s, const bool ensure_ascii, - const error_handler_t error_handler = error_handler_t::strict) + void dump_escaped(const string_t& s, const bool ensure_ascii) { uint32_t codepoint; uint8_t state = UTF8_ACCEPT; std::size_t bytes = 0; // number of bytes written to string_buffer + // number of bytes written at the point of the last valid byte + std::size_t bytes_after_last_accept = 0; + for (std::size_t i = 0; i < s.size(); ++i) { const auto byte = static_cast(s[i]); @@ -394,6 +400,9 @@ class serializer o->write_characters(string_buffer.data(), bytes); bytes = 0; } + + // remember the byte position of this accept + bytes_after_last_accept = bytes; break; } @@ -409,19 +418,33 @@ class serializer } case error_handler_t::ignore: - { - state = UTF8_ACCEPT; - continue; - } - case error_handler_t::replace: { - string_buffer[bytes++] = '\\'; - string_buffer[bytes++] = 'u'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'd'; + // in case we saw this chatacter the first time, we + // would like to read it again, because the byte + // may be OK for itself, but just not OK for the + // previous sequence + if (bytes_after_last_accept != bytes) + { + --i; + } + + // reset length buffer to the last accepted index; + // thus removing/ignoring the invalid characters + bytes = bytes_after_last_accept; + + if (error_handler == error_handler_t::replace) + { + // add a replacement character + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'u'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'd'; + } + + // continue processing the string state = UTF8_ACCEPT; continue; } @@ -440,6 +463,7 @@ class serializer } } + // we finished processing the string if (JSON_LIKELY(state == UTF8_ACCEPT)) { // write buffer @@ -462,13 +486,16 @@ class serializer case error_handler_t::ignore: { + // write all accepted bytes + o->write_characters(string_buffer.data(), bytes_after_last_accept); break; } case error_handler_t::replace: { - // write buffer, but replace last byte - o->write_characters(string_buffer.data(), bytes - 1); + // write all accepted bytes + o->write_characters(string_buffer.data(), bytes_after_last_accept); + // add a replacement character o->write_characters("\\ufffd", 6); break; } @@ -682,6 +709,9 @@ class serializer const char indent_char; /// the indentation string string_t indent_string; + + /// error_handler how to react on decoding errors + const error_handler_t error_handler; }; } // namespace detail } // namespace nlohmann diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 619fd9e6..a5f7d47d 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -208,6 +208,8 @@ class basic_json using json_pointer = ::nlohmann::json_pointer; template using json_serializer = JSONSerializer; + /// how to treat decoding errors + using error_handler_t = detail::error_handler_t; /// helper type for initializer lists of basic_json values using initializer_list_t = std::initializer_list>; @@ -1932,6 +1934,10 @@ class basic_json @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters in the output are escaped with `\uXXXX` sequences, and the result consists of ASCII characters only. + @param[in] error_handler how to react on decoding errors; there are three + possible values: `strict` (throws and exception in case a decoding error + occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD), + and `ignore` (ignore invalid UTF-8 sequences during serialization). @return string containing the serialization of the JSON value @@ -1950,13 +1956,16 @@ class basic_json @see https://docs.python.org/2/library/json.html#json.dump @since version 1.0.0; indentation character @a indent_char, option - @a ensure_ascii and exceptions added in version 3.0.0 + @a ensure_ascii and exceptions added in version 3.0.0; error + handlers added in version 3.4.0. */ - string_t dump(const int indent = -1, const char indent_char = ' ', - const bool ensure_ascii = false) const + string_t dump(const int indent = -1, + const char indent_char = ' ', + const bool ensure_ascii = false, + const error_handler_t error_handler = error_handler_t::strict) const { string_t result; - serializer s(detail::output_adapter(result), indent_char); + serializer s(detail::output_adapter(result), indent_char, error_handler); if (indent >= 0) { diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index c4681d7b..b3a4487e 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -9980,6 +9980,14 @@ namespace detail // serialization // /////////////////// +/// how to treat decoding errors +enum class error_handler_t +{ + strict, ///< throw a type_error exception in case of invalid UTF-8 + replace, ///< replace invalid UTF-8 sequences with U+FFFD + ignore ///< ignore invalid UTF-8 sequences +}; + template class serializer { @@ -9991,23 +9999,20 @@ class serializer static constexpr uint8_t UTF8_REJECT = 1; public: - /// how to treat decoding errors - enum class error_handler_t - { - strict, ///< throw a type_error exception in case of invalid UTF-8 - replace, ///< replace invalid UTF-8 sequences with U+FFFD - ignore ///< ignore invalid UTF-8 sequences - }; - /*! @param[in] s output stream to serialize to @param[in] ichar indentation character to use + @param[in] error_handler_ how to react on decoding errors */ - serializer(output_adapter_t s, const char ichar) - : o(std::move(s)), loc(std::localeconv()), - thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep)), - decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point)), - indent_char(ichar), indent_string(512, indent_char) + serializer(output_adapter_t s, const char ichar, + error_handler_t error_handler_ = error_handler_t::strict) + : o(std::move(s)) + , loc(std::localeconv()) + , thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep)) + , decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point)) + , indent_char(ichar) + , indent_string(512, indent_char) + , error_handler(error_handler_) {} // delete because of pointer members @@ -10238,17 +10243,18 @@ class serializer @param[in] s the string to escape @param[in] ensure_ascii whether to escape non-ASCII characters with \uXXXX sequences - @param[in] error_handler how to react on decoding errors @complexity Linear in the length of string @a s. */ - void dump_escaped(const string_t& s, const bool ensure_ascii, - const error_handler_t error_handler = error_handler_t::strict) + void dump_escaped(const string_t& s, const bool ensure_ascii) { uint32_t codepoint; uint8_t state = UTF8_ACCEPT; std::size_t bytes = 0; // number of bytes written to string_buffer + // number of bytes written at the point of the last valid byte + std::size_t bytes_after_last_accept = 0; + for (std::size_t i = 0; i < s.size(); ++i) { const auto byte = static_cast(s[i]); @@ -10346,6 +10352,9 @@ class serializer o->write_characters(string_buffer.data(), bytes); bytes = 0; } + + // remember the byte position of this accept + bytes_after_last_accept = bytes; break; } @@ -10361,19 +10370,33 @@ class serializer } case error_handler_t::ignore: - { - state = UTF8_ACCEPT; - continue; - } - case error_handler_t::replace: { - string_buffer[bytes++] = '\\'; - string_buffer[bytes++] = 'u'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'd'; + // in case we saw this chatacter the first time, we + // would like to read it again, because the byte + // may be OK for itself, but just not OK for the + // previous sequence + if (bytes_after_last_accept != bytes) + { + --i; + } + + // reset length buffer to the last accepted index; + // thus removing/ignoring the invalid characters + bytes = bytes_after_last_accept; + + if (error_handler == error_handler_t::replace) + { + // add a replacement character + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'u'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'd'; + } + + // continue processing the string state = UTF8_ACCEPT; continue; } @@ -10392,6 +10415,7 @@ class serializer } } + // we finished processing the string if (JSON_LIKELY(state == UTF8_ACCEPT)) { // write buffer @@ -10414,13 +10438,16 @@ class serializer case error_handler_t::ignore: { + // write all accepted bytes + o->write_characters(string_buffer.data(), bytes_after_last_accept); break; } case error_handler_t::replace: { - // write buffer, but replace last byte - o->write_characters(string_buffer.data(), bytes - 1); + // write all accepted bytes + o->write_characters(string_buffer.data(), bytes_after_last_accept); + // add a replacement character o->write_characters("\\ufffd", 6); break; } @@ -10634,6 +10661,9 @@ class serializer const char indent_char; /// the indentation string string_t indent_string; + + /// error_handler how to react on decoding errors + const error_handler_t error_handler; }; } // namespace detail } // namespace nlohmann @@ -11603,6 +11633,8 @@ class basic_json using json_pointer = ::nlohmann::json_pointer; template using json_serializer = JSONSerializer; + /// how to treat decoding errors + using error_handler_t = detail::error_handler_t; /// helper type for initializer lists of basic_json values using initializer_list_t = std::initializer_list>; @@ -13327,6 +13359,10 @@ class basic_json @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters in the output are escaped with `\uXXXX` sequences, and the result consists of ASCII characters only. + @param[in] error_handler how to react on decoding errors; there are three + possible values: `strict` (throws and exception in case a decoding error + occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD), + and `ignore` (ignore invalid UTF-8 sequences during serialization). @return string containing the serialization of the JSON value @@ -13345,13 +13381,16 @@ class basic_json @see https://docs.python.org/2/library/json.html#json.dump @since version 1.0.0; indentation character @a indent_char, option - @a ensure_ascii and exceptions added in version 3.0.0 + @a ensure_ascii and exceptions added in version 3.0.0; error + handlers added in version 3.4.0. */ - string_t dump(const int indent = -1, const char indent_char = ' ', - const bool ensure_ascii = false) const + string_t dump(const int indent = -1, + const char indent_char = ' ', + const bool ensure_ascii = false, + const error_handler_t error_handler = error_handler_t::strict) const { string_t result; - serializer s(detail::output_adapter(result), indent_char); + serializer s(detail::output_adapter(result), indent_char, error_handler); if (indent >= 0) { diff --git a/test/src/unit-serialization.cpp b/test/src/unit-serialization.cpp index 0eed7246..e4069f73 100644 --- a/test/src/unit-serialization.cpp +++ b/test/src/unit-serialization.cpp @@ -94,4 +94,41 @@ TEST_CASE("serialization") "[\n\t\"foo\",\n\t1,\n\t2,\n\t3,\n\tfalse,\n\t{\n\t\t\"one\": 1\n\t}\n]"); } } + + SECTION("dump") + { + SECTION("invalid character") + { + json j = "ä\xA9ü"; + + CHECK_THROWS_AS(j.dump(), json::type_error&); + CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9"); + CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&); + CHECK_THROWS_WITH(j.dump(1, ' ', false, json::error_handler_t::strict), "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9"); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"äü\""); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"ä\\ufffdü\""); + } + + SECTION("ending with incomplete character") + { + json j = "123\xC2"; + + CHECK_THROWS_AS(j.dump(), json::type_error&); + CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2"); + CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"123\""); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\\ufffd\""); + } + + SECTION("unexpected character") + { + json j = "123\xF1\xB0\x34\x35\x36"; + + CHECK_THROWS_AS(j.dump(), json::type_error&); + CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 5: 0x34"); + CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"123456\""); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\\ufffd456\""); + } + } } From e5dce641159874b9485d4c8a310b82e34b7aca18 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 21 Oct 2018 23:26:25 +0200 Subject: [PATCH 46/77] :green_heart: added tests #1198 Test every prefix of Unicode sequences against the different dump functions. --- include/nlohmann/detail/output/serializer.hpp | 1 + single_include/nlohmann/json.hpp | 1 + test/src/unit-unicode.cpp | 120 ++++++++++++++++++ 3 files changed, 122 insertions(+) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 3ccca482..c022c307 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -442,6 +442,7 @@ class serializer string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'd'; + bytes_after_last_accept = bytes; } // continue processing the string diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index b3a4487e..4e86fafc 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -10394,6 +10394,7 @@ class serializer string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'f'; string_buffer[bytes++] = 'd'; + bytes_after_last_accept = bytes; } // continue processing the string diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index 4def1a3e..c71f6f1d 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -39,6 +39,79 @@ using nlohmann::json; extern size_t calls; size_t calls = 0; +void check_utf8dump(bool success_expected, int byte1, int byte2, int byte3, int byte4); + +void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 = -1, int byte4 = -1) +{ + std::string json_string; + + CAPTURE(byte1); + CAPTURE(byte2); + CAPTURE(byte3); + CAPTURE(byte4); + + json_string += std::string(1, static_cast(byte1)); + + if (byte2 != -1) + { + json_string += std::string(1, static_cast(byte2)); + } + + if (byte3 != -1) + { + json_string += std::string(1, static_cast(byte3)); + } + + if (byte4 != -1) + { + json_string += std::string(1, static_cast(byte4)); + } + + CAPTURE(json_string); + + // store the string in a JSON value + json j = json_string; + json j2 = "abc" + json_string + "xyz"; + + // dumping with ignore/replace must not throw in any case + auto s_ignored = j.dump(-1, ' ', false, json::error_handler_t::ignore); + auto s_ignored2 = j2.dump(-1, ' ', false, json::error_handler_t::ignore); + auto s_replaced = j.dump(-1, ' ', false, json::error_handler_t::replace); + auto s_replaced2 = j2.dump(-1, ' ', false, json::error_handler_t::replace); + + if (success_expected) + { + // strict mode must not throw if success is expected + auto s_strict = j.dump(); + // all dumps should agree on the string + CHECK(s_strict == s_ignored); + CHECK(s_strict == s_replaced); + + // check that ignore/replace string does not contain a replacement character + CHECK(s_ignored.find("\\ufffd") == std::string::npos); + CHECK(s_replaced.find("\\ufffd") == std::string::npos); + } + else + { + // strict mode must throw if success is not expected + CHECK_THROWS_AS(j.dump(), json::type_error&); + // ignore and replace must create different dumps + CHECK(s_ignored != s_replaced); + + // check that ignore string does not contain a replacement character + CHECK(s_ignored.find("\\ufffd") == std::string::npos); + // check that replace string contains a replacement character + CHECK(s_replaced.find("\\ufffd") != std::string::npos); + + } + + // check that prefix and suffix are preserved + CHECK(s_ignored2.substr(1, 3) == "abc"); + CHECK(s_ignored2.substr(s_ignored2.size() - 4, 3) == "xyz"); + CHECK(s_replaced2.substr(1, 3) == "abc"); + CHECK(s_replaced2.substr(s_replaced2.size() - 4, 3) == "xyz"); +} + void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4); // create and check a JSON string with up to four UTF-8 bytes @@ -115,11 +188,13 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0x80; byte1 <= 0xC1; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } for (int byte1 = 0xF5; byte1 <= 0xFF; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -152,6 +227,7 @@ TEST_CASE("Unicode", "[hide]") // all other characters are OK check_utf8string(true, byte1); + check_utf8dump(true, byte1); } } } @@ -165,6 +241,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2) { check_utf8string(true, byte1, byte2); + check_utf8dump(true, byte1, byte2); } } } @@ -174,6 +251,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0xC2; byte1 <= 0xDF; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -190,6 +268,7 @@ TEST_CASE("Unicode", "[hide]") } check_utf8string(false, byte1, byte2); + check_utf8dump(false, byte1, byte2); } } } @@ -206,6 +285,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(true, byte1, byte2, byte3); + check_utf8dump(true, byte1, byte2, byte3); } } } @@ -216,6 +296,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0xE0; byte1 <= 0xE0; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -226,6 +307,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte2 = 0xA0; byte2 <= 0xBF; ++byte2) { check_utf8string(false, byte1, byte2); + check_utf8dump(false, byte1, byte2); } } } @@ -245,6 +327,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -265,6 +348,7 @@ TEST_CASE("Unicode", "[hide]") } check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -282,6 +366,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(true, byte1, byte2, byte3); + check_utf8dump(true, byte1, byte2, byte3); } } } @@ -292,6 +377,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0xE1; byte1 <= 0xEC; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -302,6 +388,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2) { check_utf8string(false, byte1, byte2); + check_utf8dump(false, byte1, byte2); } } } @@ -321,6 +408,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -341,6 +429,7 @@ TEST_CASE("Unicode", "[hide]") } check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -358,6 +447,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(true, byte1, byte2, byte3); + check_utf8dump(true, byte1, byte2, byte3); } } } @@ -368,6 +458,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0xED; byte1 <= 0xED; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -378,6 +469,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte2 = 0x80; byte2 <= 0x9F; ++byte2) { check_utf8string(false, byte1, byte2); + check_utf8dump(false, byte1, byte2); } } } @@ -397,6 +489,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -417,6 +510,7 @@ TEST_CASE("Unicode", "[hide]") } check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -434,6 +528,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(true, byte1, byte2, byte3); + check_utf8dump(true, byte1, byte2, byte3); } } } @@ -444,6 +539,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0xEE; byte1 <= 0xEF; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -454,6 +550,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2) { check_utf8string(false, byte1, byte2); + check_utf8dump(false, byte1, byte2); } } } @@ -473,6 +570,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -493,6 +591,7 @@ TEST_CASE("Unicode", "[hide]") } check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -512,6 +611,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(true, byte1, byte2, byte3, byte4); + check_utf8dump(true, byte1, byte2, byte3, byte4); } } } @@ -523,6 +623,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0xF0; byte1 <= 0xF0; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -533,6 +634,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte2 = 0x90; byte2 <= 0xBF; ++byte2) { check_utf8string(false, byte1, byte2); + check_utf8dump(false, byte1, byte2); } } } @@ -546,6 +648,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -568,6 +671,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } @@ -591,6 +695,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } @@ -614,6 +719,7 @@ TEST_CASE("Unicode", "[hide]") } check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } @@ -634,6 +740,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(true, byte1, byte2, byte3, byte4); + check_utf8dump(true, byte1, byte2, byte3, byte4); } } } @@ -645,6 +752,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0xF1; byte1 <= 0xF3; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -655,6 +763,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte2 = 0x80; byte2 <= 0xBF; ++byte2) { check_utf8string(false, byte1, byte2); + check_utf8dump(false, byte1, byte2); } } } @@ -668,6 +777,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -690,6 +800,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } @@ -713,6 +824,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } @@ -736,6 +848,7 @@ TEST_CASE("Unicode", "[hide]") } check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } @@ -756,6 +869,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(true, byte1, byte2, byte3, byte4); + check_utf8dump(true, byte1, byte2, byte3, byte4); } } } @@ -767,6 +881,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte1 = 0xF4; byte1 <= 0xF4; ++byte1) { check_utf8string(false, byte1); + check_utf8dump(false, byte1); } } @@ -777,6 +892,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte2 = 0x80; byte2 <= 0x8F; ++byte2) { check_utf8string(false, byte1, byte2); + check_utf8dump(false, byte1, byte2); } } } @@ -790,6 +906,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte3 = 0x80; byte3 <= 0xBF; ++byte3) { check_utf8string(false, byte1, byte2, byte3); + check_utf8dump(false, byte1, byte2, byte3); } } } @@ -812,6 +929,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } @@ -835,6 +953,7 @@ TEST_CASE("Unicode", "[hide]") for (int byte4 = 0x80; byte4 <= 0xBF; ++byte4) { check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } @@ -858,6 +977,7 @@ TEST_CASE("Unicode", "[hide]") } check_utf8string(false, byte1, byte2, byte3, byte4); + check_utf8dump(false, byte1, byte2, byte3, byte4); } } } From c7af027cbb2edc39bb35ed5881adfac3ac45f14d Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 22 Oct 2018 09:18:16 +0200 Subject: [PATCH 47/77] :construction: respect ensure_ascii parameter #1198 --- include/nlohmann/detail/output/serializer.hpp | 30 ++++++++++++++----- single_include/nlohmann/json.hpp | 30 ++++++++++++++----- test/src/unit-unicode.cpp | 8 +---- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index c022c307..d21cd8fe 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -436,12 +436,21 @@ class serializer if (error_handler == error_handler_t::replace) { // add a replacement character - string_buffer[bytes++] = '\\'; - string_buffer[bytes++] = 'u'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'd'; + if (ensure_ascii) + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'u'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'd'; + } + else + { + string_buffer[bytes++] = '\xEF'; + string_buffer[bytes++] = '\xBF'; + string_buffer[bytes++] = '\xBD'; + } bytes_after_last_accept = bytes; } @@ -497,7 +506,14 @@ class serializer // write all accepted bytes o->write_characters(string_buffer.data(), bytes_after_last_accept); // add a replacement character - o->write_characters("\\ufffd", 6); + if (ensure_ascii) + { + o->write_characters("\\ufffd", 6); + } + else + { + o->write_characters("\xEF\xBF\xBD", 3); + } break; } } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 4e86fafc..f1335cd4 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -10388,12 +10388,21 @@ class serializer if (error_handler == error_handler_t::replace) { // add a replacement character - string_buffer[bytes++] = '\\'; - string_buffer[bytes++] = 'u'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'f'; - string_buffer[bytes++] = 'd'; + if (ensure_ascii) + { + string_buffer[bytes++] = '\\'; + string_buffer[bytes++] = 'u'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'f'; + string_buffer[bytes++] = 'd'; + } + else + { + string_buffer[bytes++] = '\xEF'; + string_buffer[bytes++] = '\xBF'; + string_buffer[bytes++] = '\xBD'; + } bytes_after_last_accept = bytes; } @@ -10449,7 +10458,14 @@ class serializer // write all accepted bytes o->write_characters(string_buffer.data(), bytes_after_last_accept); // add a replacement character - o->write_characters("\\ufffd", 6); + if (ensure_ascii) + { + o->write_characters("\\ufffd", 6); + } + else + { + o->write_characters("\xEF\xBF\xBD", 3); + } break; } } diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index c71f6f1d..acc384bd 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -86,10 +86,6 @@ void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 // all dumps should agree on the string CHECK(s_strict == s_ignored); CHECK(s_strict == s_replaced); - - // check that ignore/replace string does not contain a replacement character - CHECK(s_ignored.find("\\ufffd") == std::string::npos); - CHECK(s_replaced.find("\\ufffd") == std::string::npos); } else { @@ -98,10 +94,8 @@ void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 // ignore and replace must create different dumps CHECK(s_ignored != s_replaced); - // check that ignore string does not contain a replacement character - CHECK(s_ignored.find("\\ufffd") == std::string::npos); // check that replace string contains a replacement character - CHECK(s_replaced.find("\\ufffd") != std::string::npos); + CHECK(s_replaced.find("\xEF\xBF\xBD") != std::string::npos); } From c51b1e6fabd676dcd84c327a99586778855b7bda Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 22 Oct 2018 15:53:36 +0200 Subject: [PATCH 48/77] :construction: fixed an issue with ensure_ascii #1198 --- include/nlohmann/detail/output/serializer.hpp | 7 ++++++- single_include/nlohmann/json.hpp | 7 ++++++- test/src/unit-unicode.cpp | 8 ++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index d21cd8fe..f1c0b051 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -302,6 +302,7 @@ class serializer // number of bytes written at the point of the last valid byte std::size_t bytes_after_last_accept = 0; + std::size_t undumped_chars = 0; for (std::size_t i = 0; i < s.size(); ++i) { @@ -403,6 +404,7 @@ class serializer // remember the byte position of this accept bytes_after_last_accept = bytes; + undumped_chars = 0; break; } @@ -424,7 +426,7 @@ class serializer // would like to read it again, because the byte // may be OK for itself, but just not OK for the // previous sequence - if (bytes_after_last_accept != bytes) + if (undumped_chars > 0) { --i; } @@ -454,6 +456,8 @@ class serializer bytes_after_last_accept = bytes; } + undumped_chars = 0; + // continue processing the string state = UTF8_ACCEPT; continue; @@ -468,6 +472,7 @@ class serializer // code point will not be escaped - copy byte to buffer string_buffer[bytes++] = s[i]; } + ++undumped_chars; break; } } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index f1335cd4..025dfeaf 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -10254,6 +10254,7 @@ class serializer // number of bytes written at the point of the last valid byte std::size_t bytes_after_last_accept = 0; + std::size_t undumped_chars = 0; for (std::size_t i = 0; i < s.size(); ++i) { @@ -10355,6 +10356,7 @@ class serializer // remember the byte position of this accept bytes_after_last_accept = bytes; + undumped_chars = 0; break; } @@ -10376,7 +10378,7 @@ class serializer // would like to read it again, because the byte // may be OK for itself, but just not OK for the // previous sequence - if (bytes_after_last_accept != bytes) + if (undumped_chars > 0) { --i; } @@ -10406,6 +10408,8 @@ class serializer bytes_after_last_accept = bytes; } + undumped_chars = 0; + // continue processing the string state = UTF8_ACCEPT; continue; @@ -10420,6 +10424,7 @@ class serializer // code point will not be escaped - copy byte to buffer string_buffer[bytes++] = s[i]; } + ++undumped_chars; break; } } diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index acc384bd..fe16eb0d 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -76,8 +76,12 @@ void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 // dumping with ignore/replace must not throw in any case auto s_ignored = j.dump(-1, ' ', false, json::error_handler_t::ignore); auto s_ignored2 = j2.dump(-1, ' ', false, json::error_handler_t::ignore); + auto s_ignored_ascii = j.dump(-1, ' ', true, json::error_handler_t::ignore); + auto s_ignored2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::ignore); auto s_replaced = j.dump(-1, ' ', false, json::error_handler_t::replace); auto s_replaced2 = j2.dump(-1, ' ', false, json::error_handler_t::replace); + auto s_replaced_ascii = j.dump(-1, ' ', true, json::error_handler_t::replace); + auto s_replaced2_ascii = j2.dump(-1, ' ', true, json::error_handler_t::replace); if (success_expected) { @@ -102,8 +106,12 @@ void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 // check that prefix and suffix are preserved CHECK(s_ignored2.substr(1, 3) == "abc"); CHECK(s_ignored2.substr(s_ignored2.size() - 4, 3) == "xyz"); + CHECK(s_ignored2_ascii.substr(1, 3) == "abc"); + CHECK(s_ignored2_ascii.substr(s_ignored2_ascii.size() - 4, 3) == "xyz"); CHECK(s_replaced2.substr(1, 3) == "abc"); CHECK(s_replaced2.substr(s_replaced2.size() - 4, 3) == "xyz"); + CHECK(s_replaced2_ascii.substr(1, 3) == "abc"); + CHECK(s_replaced2_ascii.substr(s_replaced2_ascii.size() - 4, 3) == "xyz"); } void check_utf8string(bool success_expected, int byte1, int byte2, int byte3, int byte4); From 951a7a64559a746e4cc6e99c0e59a7a00bd72394 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 22 Oct 2018 18:20:45 +0200 Subject: [PATCH 49/77] :construction: fixed test cases #1198 --- test/src/unit-serialization.cpp | 9 ++++++--- test/src/unit-unicode.cpp | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/src/unit-serialization.cpp b/test/src/unit-serialization.cpp index e4069f73..0255edc9 100644 --- a/test/src/unit-serialization.cpp +++ b/test/src/unit-serialization.cpp @@ -106,7 +106,8 @@ TEST_CASE("serialization") CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&); CHECK_THROWS_WITH(j.dump(1, ' ', false, json::error_handler_t::strict), "[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9"); CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"äü\""); - CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"ä\\ufffdü\""); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"ä\xEF\xBF\xBDü\""); + CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"\\u00e4\\ufffd\\u00fc\""); } SECTION("ending with incomplete character") @@ -117,7 +118,8 @@ TEST_CASE("serialization") CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] incomplete UTF-8 string; last byte: 0xC2"); CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&); CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"123\""); - CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\\ufffd\""); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\xEF\xBF\xBD\""); + CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"123\\ufffd\""); } SECTION("unexpected character") @@ -128,7 +130,8 @@ TEST_CASE("serialization") CHECK_THROWS_WITH(j.dump(), "[json.exception.type_error.316] invalid UTF-8 byte at index 5: 0x34"); CHECK_THROWS_AS(j.dump(1, ' ', false, json::error_handler_t::strict), json::type_error&); CHECK(j.dump(-1, ' ', false, json::error_handler_t::ignore) == "\"123456\""); - CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\\ufffd456\""); + CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\xEF\xBF\xBD\x34\x35\x36\""); + CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"123\\ufffd456\""); } } } diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index fe16eb0d..a8a0a938 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -100,7 +100,6 @@ void check_utf8dump(bool success_expected, int byte1, int byte2 = -1, int byte3 // check that replace string contains a replacement character CHECK(s_replaced.find("\xEF\xBF\xBD") != std::string::npos); - } // check that prefix and suffix are preserved From 2343d9caeb12cb0047762c38f22cf428eea61d7f Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 23 Oct 2018 17:22:13 +0200 Subject: [PATCH 50/77] :green_heart: additional tests from the Unicode spec #1198 Thanks @abolz! --- test/src/unit-serialization.cpp | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/test/src/unit-serialization.cpp b/test/src/unit-serialization.cpp index 0255edc9..1fe796e5 100644 --- a/test/src/unit-serialization.cpp +++ b/test/src/unit-serialization.cpp @@ -133,5 +133,41 @@ TEST_CASE("serialization") CHECK(j.dump(-1, ' ', false, json::error_handler_t::replace) == "\"123\xEF\xBF\xBD\x34\x35\x36\""); CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"123\\ufffd456\""); } + + SECTION("U+FFFD Substitution of Maximal Subparts") + { + // Some tests (mostly) from + // https://www.unicode.org/versions/Unicode11.0.0/ch03.pdf + // Section 3.9 -- U+FFFD Substitution of Maximal Subparts + + auto test = [&](std::string const & input, std::string const & expected) + { + json j = input; + CHECK(j.dump(-1, ' ', true, json::error_handler_t::replace) == "\"" + expected + "\""); + }; + + test("\xC2", "\\ufffd"); + test("\xC2\x41\x42", "\\ufffd" "\x41" "\x42"); + test("\xC2\xF4", "\\ufffd" "\\ufffd"); + + test("\xF0\x80\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41"); + test("\xF1\x80\x80\x41", "\\ufffd" "\x41"); + test("\xF2\x80\x80\x41", "\\ufffd" "\x41"); + test("\xF3\x80\x80\x41", "\\ufffd" "\x41"); + test("\xF4\x80\x80\x41", "\\ufffd" "\x41"); + test("\xF5\x80\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41"); + + test("\xF0\x90\x80\x41", "\\ufffd" "\x41"); + test("\xF1\x90\x80\x41", "\\ufffd" "\x41"); + test("\xF2\x90\x80\x41", "\\ufffd" "\x41"); + test("\xF3\x90\x80\x41", "\\ufffd" "\x41"); + test("\xF4\x90\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41"); + test("\xF5\x90\x80\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\x41"); + + test("\xC0\xAF\xE0\x80\xBF\xF0\x81\x82\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41"); + test("\xED\xA0\x80\xED\xBF\xBF\xED\xAF\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41"); + test("\xF4\x91\x92\x93\xFF\x41\x80\xBF\x42", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41" "\\ufffd""\\ufffd" "\x42"); + test("\xE1\x80\xE2\xF0\x91\x92\xF1\xBF\x41", "\\ufffd" "\\ufffd" "\\ufffd" "\\ufffd" "\x41"); + } } } From b49f76931faeb8f3ace41a247715512d7ed41988 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 23 Oct 2018 17:49:04 +0200 Subject: [PATCH 51/77] :ok_hand: replaced static_cast to CharType by conversion function #1286 --- include/nlohmann/detail/meta/type_traits.hpp | 12 +- .../nlohmann/detail/output/binary_writer.hpp | 175 +++++++++------- single_include/nlohmann/json.hpp | 187 ++++++++++-------- 3 files changed, 212 insertions(+), 162 deletions(-) diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index efe878f6..4c4c4d3d 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -193,13 +193,13 @@ struct is_constructible_object_type_impl < static constexpr bool value = std::is_constructible::value and - std::is_same::value or - (has_from_json::value or - has_non_default_from_json < - BasicJsonType, - typename ConstructibleObjectType::mapped_type >::value); + (has_from_json::value or + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value)); }; template diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index d4b5e98f..6312020e 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -43,15 +43,15 @@ class binary_writer { case value_t::null: { - oa->write_character(static_cast(0xF6)); + oa->write_character(to_char_type(0xF6)); break; } case value_t::boolean: { oa->write_character(j.m_value.boolean - ? static_cast(0xF5) - : static_cast(0xF4)); + ? to_char_type(0xF5) + : to_char_type(0xF4)); break; } @@ -68,22 +68,22 @@ class binary_writer } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x18)); + oa->write_character(to_char_type(0x18)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x19)); + oa->write_character(to_char_type(0x19)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x1A)); + oa->write_character(to_char_type(0x1A)); write_number(static_cast(j.m_value.number_integer)); } else { - oa->write_character(static_cast(0x1B)); + oa->write_character(to_char_type(0x1B)); write_number(static_cast(j.m_value.number_integer)); } } @@ -98,22 +98,22 @@ class binary_writer } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x38)); + oa->write_character(to_char_type(0x38)); write_number(static_cast(positive_number)); } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x39)); + oa->write_character(to_char_type(0x39)); write_number(static_cast(positive_number)); } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x3A)); + oa->write_character(to_char_type(0x3A)); write_number(static_cast(positive_number)); } else { - oa->write_character(static_cast(0x3B)); + oa->write_character(to_char_type(0x3B)); write_number(static_cast(positive_number)); } } @@ -128,22 +128,22 @@ class binary_writer } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x18)); + oa->write_character(to_char_type(0x18)); write_number(static_cast(j.m_value.number_unsigned)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x19)); + oa->write_character(to_char_type(0x19)); write_number(static_cast(j.m_value.number_unsigned)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x1A)); + oa->write_character(to_char_type(0x1A)); write_number(static_cast(j.m_value.number_unsigned)); } else { - oa->write_character(static_cast(0x1B)); + oa->write_character(to_char_type(0x1B)); write_number(static_cast(j.m_value.number_unsigned)); } break; @@ -166,23 +166,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x78)); + oa->write_character(to_char_type(0x78)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x79)); + oa->write_character(to_char_type(0x79)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x7A)); + oa->write_character(to_char_type(0x7A)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x7B)); + oa->write_character(to_char_type(0x7B)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -204,23 +204,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x98)); + oa->write_character(to_char_type(0x98)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x99)); + oa->write_character(to_char_type(0x99)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x9A)); + oa->write_character(to_char_type(0x9A)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x9B)); + oa->write_character(to_char_type(0x9B)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -243,23 +243,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xB8)); + oa->write_character(to_char_type(0xB8)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xB9)); + oa->write_character(to_char_type(0xB9)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xBA)); + oa->write_character(to_char_type(0xBA)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xBB)); + oa->write_character(to_char_type(0xBB)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -287,15 +287,15 @@ class binary_writer { case value_t::null: // nil { - oa->write_character(static_cast(0xC0)); + oa->write_character(to_char_type(0xC0)); break; } case value_t::boolean: // true and false { oa->write_character(j.m_value.boolean - ? static_cast(0xC3) - : static_cast(0xC2)); + ? to_char_type(0xC3) + : to_char_type(0xC2)); break; } @@ -314,25 +314,25 @@ class binary_writer else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 8 - oa->write_character(static_cast(0xCC)); + oa->write_character(to_char_type(0xCC)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 16 - oa->write_character(static_cast(0xCD)); + oa->write_character(to_char_type(0xCD)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 32 - oa->write_character(static_cast(0xCE)); + oa->write_character(to_char_type(0xCE)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 64 - oa->write_character(static_cast(0xCF)); + oa->write_character(to_char_type(0xCF)); write_number(static_cast(j.m_value.number_integer)); } } @@ -347,28 +347,28 @@ class binary_writer j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 8 - oa->write_character(static_cast(0xD0)); + oa->write_character(to_char_type(0xD0)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 16 - oa->write_character(static_cast(0xD1)); + oa->write_character(to_char_type(0xD1)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 32 - oa->write_character(static_cast(0xD2)); + oa->write_character(to_char_type(0xD2)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 64 - oa->write_character(static_cast(0xD3)); + oa->write_character(to_char_type(0xD3)); write_number(static_cast(j.m_value.number_integer)); } } @@ -385,25 +385,25 @@ class binary_writer else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 8 - oa->write_character(static_cast(0xCC)); + oa->write_character(to_char_type(0xCC)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 16 - oa->write_character(static_cast(0xCD)); + oa->write_character(to_char_type(0xCD)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 32 - oa->write_character(static_cast(0xCE)); + oa->write_character(to_char_type(0xCE)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 64 - oa->write_character(static_cast(0xCF)); + oa->write_character(to_char_type(0xCF)); write_number(static_cast(j.m_value.number_integer)); } break; @@ -428,19 +428,19 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // str 8 - oa->write_character(static_cast(0xD9)); + oa->write_character(to_char_type(0xD9)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // str 16 - oa->write_character(static_cast(0xDA)); + oa->write_character(to_char_type(0xDA)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // str 32 - oa->write_character(static_cast(0xDB)); + oa->write_character(to_char_type(0xDB)); write_number(static_cast(N)); } @@ -463,13 +463,13 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // array 16 - oa->write_character(static_cast(0xDC)); + oa->write_character(to_char_type(0xDC)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // array 32 - oa->write_character(static_cast(0xDD)); + oa->write_character(to_char_type(0xDD)); write_number(static_cast(N)); } @@ -493,13 +493,13 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // map 16 - oa->write_character(static_cast(0xDE)); + oa->write_character(to_char_type(0xDE)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // map 32 - oa->write_character(static_cast(0xDF)); + oa->write_character(to_char_type(0xDF)); write_number(static_cast(N)); } @@ -532,7 +532,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('Z')); + oa->write_character(to_char_type('Z')); } break; } @@ -542,8 +542,8 @@ class binary_writer if (add_prefix) { oa->write_character(j.m_value.boolean - ? static_cast('T') - : static_cast('F')); + ? to_char_type('T') + : to_char_type('F')); } break; } @@ -570,7 +570,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('S')); + oa->write_character(to_char_type('S')); } write_number_with_ubjson_prefix(j.m_value.string->size(), true); oa->write_characters( @@ -583,7 +583,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('[')); + oa->write_character(to_char_type('[')); } bool prefix_required = true; @@ -600,14 +600,14 @@ class binary_writer if (same_prefix) { prefix_required = false; - oa->write_character(static_cast('$')); + oa->write_character(to_char_type('$')); oa->write_character(first_prefix); } } if (use_count) { - oa->write_character(static_cast('#')); + oa->write_character(to_char_type('#')); write_number_with_ubjson_prefix(j.m_value.array->size(), true); } @@ -618,7 +618,7 @@ class binary_writer if (not use_count) { - oa->write_character(static_cast(']')); + oa->write_character(to_char_type(']')); } break; @@ -628,7 +628,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('{')); + oa->write_character(to_char_type('{')); } bool prefix_required = true; @@ -645,14 +645,14 @@ class binary_writer if (same_prefix) { prefix_required = false; - oa->write_character(static_cast('$')); + oa->write_character(to_char_type('$')); oa->write_character(first_prefix); } } if (use_count) { - oa->write_character(static_cast('#')); + oa->write_character(to_char_type('#')); write_number_with_ubjson_prefix(j.m_value.object->size(), true); } @@ -667,7 +667,7 @@ class binary_writer if (not use_count) { - oa->write_character(static_cast('}')); + oa->write_character(to_char_type('}')); } break; @@ -729,7 +729,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('i')); // int8 + oa->write_character(to_char_type('i')); // int8 } write_number(static_cast(n)); } @@ -737,7 +737,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('U')); // uint8 + oa->write_character(to_char_type('U')); // uint8 } write_number(static_cast(n)); } @@ -745,7 +745,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('I')); // int16 + oa->write_character(to_char_type('I')); // int16 } write_number(static_cast(n)); } @@ -753,7 +753,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('l')); // int32 + oa->write_character(to_char_type('l')); // int32 } write_number(static_cast(n)); } @@ -761,7 +761,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('L')); // int64 + oa->write_character(to_char_type('L')); // int64 } write_number(static_cast(n)); } @@ -782,7 +782,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('i')); // int8 + oa->write_character(to_char_type('i')); // int8 } write_number(static_cast(n)); } @@ -790,7 +790,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('U')); // uint8 + oa->write_character(to_char_type('U')); // uint8 } write_number(static_cast(n)); } @@ -798,7 +798,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('I')); // int16 + oa->write_character(to_char_type('I')); // int16 } write_number(static_cast(n)); } @@ -806,7 +806,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('l')); // int32 + oa->write_character(to_char_type('l')); // int32 } write_number(static_cast(n)); } @@ -814,7 +814,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('L')); // int64 + oa->write_character(to_char_type('L')); // int64 } write_number(static_cast(n)); } @@ -908,22 +908,22 @@ class binary_writer static constexpr CharType get_cbor_float_prefix(float /*unused*/) { - return static_cast(0xFA); // Single-Precision Float + return to_char_type(0xFA); // Single-Precision Float } static constexpr CharType get_cbor_float_prefix(double /*unused*/) { - return static_cast(0xFB); // Double-Precision Float + return to_char_type(0xFB); // Double-Precision Float } static constexpr CharType get_msgpack_float_prefix(float /*unused*/) { - return static_cast(0xCA); // float 32 + return to_char_type(0xCA); // float 32 } static constexpr CharType get_msgpack_float_prefix(double /*unused*/) { - return static_cast(0xCB); // float 64 + return to_char_type(0xCB); // float 64 } static constexpr CharType get_ubjson_float_prefix(float /*unused*/) @@ -936,6 +936,31 @@ class binary_writer return 'D'; // float 64 } + template < typename C = CharType, + enable_if_t < std::is_signed::value and std::is_signed::value > * = nullptr > + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return *reinterpret_cast(&x); + } + + template < typename C = CharType, + enable_if_t < std::is_signed::value and std::is_unsigned::value > * = nullptr > + static CharType to_char_type(std::uint8_t x) noexcept + { + static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); + static_assert(std::is_pod::value, "CharType must be POD"); + CharType result; + std::memcpy(&result, &x, sizeof(x)); + return result; + } + + template::value>* = nullptr> + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return x; + } + private: /// whether we can assume little endianess const bool is_little_endian = binary_reader::little_endianess(); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 1de78dfc..9e2439ae 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -553,13 +553,13 @@ struct is_constructible_object_type_impl < static constexpr bool value = std::is_constructible::value and - std::is_same::value or - (has_from_json::value or - has_non_default_from_json < - BasicJsonType, - typename ConstructibleObjectType::mapped_type >::value); + (has_from_json::value or + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value)); }; template @@ -8088,15 +8088,15 @@ class binary_writer { case value_t::null: { - oa->write_character(static_cast(0xF6)); + oa->write_character(to_char_type(0xF6)); break; } case value_t::boolean: { oa->write_character(j.m_value.boolean - ? static_cast(0xF5) - : static_cast(0xF4)); + ? to_char_type(0xF5) + : to_char_type(0xF4)); break; } @@ -8113,22 +8113,22 @@ class binary_writer } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x18)); + oa->write_character(to_char_type(0x18)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x19)); + oa->write_character(to_char_type(0x19)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x1A)); + oa->write_character(to_char_type(0x1A)); write_number(static_cast(j.m_value.number_integer)); } else { - oa->write_character(static_cast(0x1B)); + oa->write_character(to_char_type(0x1B)); write_number(static_cast(j.m_value.number_integer)); } } @@ -8143,22 +8143,22 @@ class binary_writer } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x38)); + oa->write_character(to_char_type(0x38)); write_number(static_cast(positive_number)); } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x39)); + oa->write_character(to_char_type(0x39)); write_number(static_cast(positive_number)); } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x3A)); + oa->write_character(to_char_type(0x3A)); write_number(static_cast(positive_number)); } else { - oa->write_character(static_cast(0x3B)); + oa->write_character(to_char_type(0x3B)); write_number(static_cast(positive_number)); } } @@ -8173,22 +8173,22 @@ class binary_writer } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x18)); + oa->write_character(to_char_type(0x18)); write_number(static_cast(j.m_value.number_unsigned)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x19)); + oa->write_character(to_char_type(0x19)); write_number(static_cast(j.m_value.number_unsigned)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x1A)); + oa->write_character(to_char_type(0x1A)); write_number(static_cast(j.m_value.number_unsigned)); } else { - oa->write_character(static_cast(0x1B)); + oa->write_character(to_char_type(0x1B)); write_number(static_cast(j.m_value.number_unsigned)); } break; @@ -8211,23 +8211,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x78)); + oa->write_character(to_char_type(0x78)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x79)); + oa->write_character(to_char_type(0x79)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x7A)); + oa->write_character(to_char_type(0x7A)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x7B)); + oa->write_character(to_char_type(0x7B)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -8249,23 +8249,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x98)); + oa->write_character(to_char_type(0x98)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x99)); + oa->write_character(to_char_type(0x99)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x9A)); + oa->write_character(to_char_type(0x9A)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x9B)); + oa->write_character(to_char_type(0x9B)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -8288,23 +8288,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xB8)); + oa->write_character(to_char_type(0xB8)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xB9)); + oa->write_character(to_char_type(0xB9)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xBA)); + oa->write_character(to_char_type(0xBA)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xBB)); + oa->write_character(to_char_type(0xBB)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -8332,15 +8332,15 @@ class binary_writer { case value_t::null: // nil { - oa->write_character(static_cast(0xC0)); + oa->write_character(to_char_type(0xC0)); break; } case value_t::boolean: // true and false { oa->write_character(j.m_value.boolean - ? static_cast(0xC3) - : static_cast(0xC2)); + ? to_char_type(0xC3) + : to_char_type(0xC2)); break; } @@ -8359,25 +8359,25 @@ class binary_writer else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 8 - oa->write_character(static_cast(0xCC)); + oa->write_character(to_char_type(0xCC)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 16 - oa->write_character(static_cast(0xCD)); + oa->write_character(to_char_type(0xCD)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 32 - oa->write_character(static_cast(0xCE)); + oa->write_character(to_char_type(0xCE)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 64 - oa->write_character(static_cast(0xCF)); + oa->write_character(to_char_type(0xCF)); write_number(static_cast(j.m_value.number_integer)); } } @@ -8392,28 +8392,28 @@ class binary_writer j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 8 - oa->write_character(static_cast(0xD0)); + oa->write_character(to_char_type(0xD0)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 16 - oa->write_character(static_cast(0xD1)); + oa->write_character(to_char_type(0xD1)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 32 - oa->write_character(static_cast(0xD2)); + oa->write_character(to_char_type(0xD2)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 64 - oa->write_character(static_cast(0xD3)); + oa->write_character(to_char_type(0xD3)); write_number(static_cast(j.m_value.number_integer)); } } @@ -8430,25 +8430,25 @@ class binary_writer else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 8 - oa->write_character(static_cast(0xCC)); + oa->write_character(to_char_type(0xCC)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 16 - oa->write_character(static_cast(0xCD)); + oa->write_character(to_char_type(0xCD)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 32 - oa->write_character(static_cast(0xCE)); + oa->write_character(to_char_type(0xCE)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 64 - oa->write_character(static_cast(0xCF)); + oa->write_character(to_char_type(0xCF)); write_number(static_cast(j.m_value.number_integer)); } break; @@ -8473,19 +8473,19 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // str 8 - oa->write_character(static_cast(0xD9)); + oa->write_character(to_char_type(0xD9)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // str 16 - oa->write_character(static_cast(0xDA)); + oa->write_character(to_char_type(0xDA)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // str 32 - oa->write_character(static_cast(0xDB)); + oa->write_character(to_char_type(0xDB)); write_number(static_cast(N)); } @@ -8508,13 +8508,13 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // array 16 - oa->write_character(static_cast(0xDC)); + oa->write_character(to_char_type(0xDC)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // array 32 - oa->write_character(static_cast(0xDD)); + oa->write_character(to_char_type(0xDD)); write_number(static_cast(N)); } @@ -8538,13 +8538,13 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // map 16 - oa->write_character(static_cast(0xDE)); + oa->write_character(to_char_type(0xDE)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // map 32 - oa->write_character(static_cast(0xDF)); + oa->write_character(to_char_type(0xDF)); write_number(static_cast(N)); } @@ -8577,7 +8577,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('Z')); + oa->write_character(to_char_type('Z')); } break; } @@ -8587,8 +8587,8 @@ class binary_writer if (add_prefix) { oa->write_character(j.m_value.boolean - ? static_cast('T') - : static_cast('F')); + ? to_char_type('T') + : to_char_type('F')); } break; } @@ -8615,7 +8615,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('S')); + oa->write_character(to_char_type('S')); } write_number_with_ubjson_prefix(j.m_value.string->size(), true); oa->write_characters( @@ -8628,7 +8628,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('[')); + oa->write_character(to_char_type('[')); } bool prefix_required = true; @@ -8645,14 +8645,14 @@ class binary_writer if (same_prefix) { prefix_required = false; - oa->write_character(static_cast('$')); + oa->write_character(to_char_type('$')); oa->write_character(first_prefix); } } if (use_count) { - oa->write_character(static_cast('#')); + oa->write_character(to_char_type('#')); write_number_with_ubjson_prefix(j.m_value.array->size(), true); } @@ -8663,7 +8663,7 @@ class binary_writer if (not use_count) { - oa->write_character(static_cast(']')); + oa->write_character(to_char_type(']')); } break; @@ -8673,7 +8673,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('{')); + oa->write_character(to_char_type('{')); } bool prefix_required = true; @@ -8690,14 +8690,14 @@ class binary_writer if (same_prefix) { prefix_required = false; - oa->write_character(static_cast('$')); + oa->write_character(to_char_type('$')); oa->write_character(first_prefix); } } if (use_count) { - oa->write_character(static_cast('#')); + oa->write_character(to_char_type('#')); write_number_with_ubjson_prefix(j.m_value.object->size(), true); } @@ -8712,7 +8712,7 @@ class binary_writer if (not use_count) { - oa->write_character(static_cast('}')); + oa->write_character(to_char_type('}')); } break; @@ -8774,7 +8774,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('i')); // int8 + oa->write_character(to_char_type('i')); // int8 } write_number(static_cast(n)); } @@ -8782,7 +8782,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('U')); // uint8 + oa->write_character(to_char_type('U')); // uint8 } write_number(static_cast(n)); } @@ -8790,7 +8790,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('I')); // int16 + oa->write_character(to_char_type('I')); // int16 } write_number(static_cast(n)); } @@ -8798,7 +8798,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('l')); // int32 + oa->write_character(to_char_type('l')); // int32 } write_number(static_cast(n)); } @@ -8806,7 +8806,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('L')); // int64 + oa->write_character(to_char_type('L')); // int64 } write_number(static_cast(n)); } @@ -8827,7 +8827,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('i')); // int8 + oa->write_character(to_char_type('i')); // int8 } write_number(static_cast(n)); } @@ -8835,7 +8835,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('U')); // uint8 + oa->write_character(to_char_type('U')); // uint8 } write_number(static_cast(n)); } @@ -8843,7 +8843,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('I')); // int16 + oa->write_character(to_char_type('I')); // int16 } write_number(static_cast(n)); } @@ -8851,7 +8851,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('l')); // int32 + oa->write_character(to_char_type('l')); // int32 } write_number(static_cast(n)); } @@ -8859,7 +8859,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('L')); // int64 + oa->write_character(to_char_type('L')); // int64 } write_number(static_cast(n)); } @@ -8953,22 +8953,22 @@ class binary_writer static constexpr CharType get_cbor_float_prefix(float /*unused*/) { - return static_cast(0xFA); // Single-Precision Float + return to_char_type(0xFA); // Single-Precision Float } static constexpr CharType get_cbor_float_prefix(double /*unused*/) { - return static_cast(0xFB); // Double-Precision Float + return to_char_type(0xFB); // Double-Precision Float } static constexpr CharType get_msgpack_float_prefix(float /*unused*/) { - return static_cast(0xCA); // float 32 + return to_char_type(0xCA); // float 32 } static constexpr CharType get_msgpack_float_prefix(double /*unused*/) { - return static_cast(0xCB); // float 64 + return to_char_type(0xCB); // float 64 } static constexpr CharType get_ubjson_float_prefix(float /*unused*/) @@ -8981,6 +8981,31 @@ class binary_writer return 'D'; // float 64 } + template < typename C = CharType, + enable_if_t < std::is_signed::value and std::is_signed::value > * = nullptr > + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return *reinterpret_cast(&x); + } + + template < typename C = CharType, + enable_if_t < std::is_signed::value and std::is_unsigned::value > * = nullptr > + static CharType to_char_type(std::uint8_t x) noexcept + { + static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); + static_assert(std::is_pod::value, "CharType must be POD"); + CharType result; + std::memcpy(&result, &x, sizeof(x)); + return result; + } + + template::value>* = nullptr> + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return x; + } + private: /// whether we can assume little endianess const bool is_little_endian = binary_reader::little_endianess(); From 87ef3f25f2bb325e96db0e4b167d63c45f682af5 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 23 Oct 2018 22:56:10 +0200 Subject: [PATCH 52/77] :pencil2: fixed a typo #1314 --- include/nlohmann/detail/output/serializer.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index f1c0b051..1d107ce0 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -422,7 +422,7 @@ class serializer case error_handler_t::ignore: case error_handler_t::replace: { - // in case we saw this chatacter the first time, we + // in case we saw this character the first time, we // would like to read it again, because the byte // may be OK for itself, but just not OK for the // previous sequence diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 025dfeaf..be3f8417 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -10374,7 +10374,7 @@ class serializer case error_handler_t::ignore: case error_handler_t::replace: { - // in case we saw this chatacter the first time, we + // in case we saw this character the first time, we // would like to read it again, because the byte // may be OK for itself, but just not OK for the // previous sequence From 20038e270300e249176c981484c2b422e3f9614d Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 23 Oct 2018 23:00:43 +0200 Subject: [PATCH 53/77] :memo: added a note to the discussion #1286 --- include/nlohmann/detail/output/binary_writer.hpp | 4 ++++ single_include/nlohmann/json.hpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 6312020e..133b60f8 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -936,6 +936,10 @@ class binary_writer return 'D'; // float 64 } + // The following to_char_type functions are implement the conversion + // between uint8_t and CharType. In case CharType is not unsigned, + // such a conversion is required to allow values greater than 128. + // See for a discussion. template < typename C = CharType, enable_if_t < std::is_signed::value and std::is_signed::value > * = nullptr > static constexpr CharType to_char_type(std::uint8_t x) noexcept diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 9e2439ae..2fd5144e 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -8981,6 +8981,10 @@ class binary_writer return 'D'; // float 64 } + // The following to_char_type functions are implement the conversion + // between uint8_t and CharType. In case CharType is not unsigned, + // such a conversion is required to allow values greater than 128. + // See for a discussion. template < typename C = CharType, enable_if_t < std::is_signed::value and std::is_signed::value > * = nullptr > static constexpr CharType to_char_type(std::uint8_t x) noexcept From f102df3cba1036d81ef5f344ebabe5cefa797cc9 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 24 Oct 2018 09:28:57 +0200 Subject: [PATCH 54/77] :memo: updated documentation #1314 --- README.md | 2 +- doc/examples/dump.cpp | 8 +++++++- doc/examples/dump.link | 2 +- doc/examples/dump.output | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c73cf1f7..eebf86df 100644 --- a/README.md +++ b/README.md @@ -309,7 +309,7 @@ std::cout << j_string << " == " << serialized_string << std::endl; [`.dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5adea76fedba9898d404fef8598aa663.html#a5adea76fedba9898d404fef8598aa663) always returns the serialized value, and [`.get()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a16f9445f7629f634221a42b967cdcd43.html#a16f9445f7629f634221a42b967cdcd43) returns the originally stored string value. -Note the library only supports UTF-8. When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5adea76fedba9898d404fef8598aa663.html#a5adea76fedba9898d404fef8598aa663) may throw an exception. +Note the library only supports UTF-8. When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5adea76fedba9898d404fef8598aa663.html#a5adea76fedba9898d404fef8598aa663) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers. #### To/from streams (e.g. files, string streams) diff --git a/doc/examples/dump.cpp b/doc/examples/dump.cpp index 4deb64a1..eb2d71f0 100644 --- a/doc/examples/dump.cpp +++ b/doc/examples/dump.cpp @@ -30,7 +30,7 @@ int main() << j_string.dump(-1, ' ', true) << '\n'; // create JSON value with invalid UTF-8 byte sequence - json j_invalid = "\xF0\xA4\xAD\xC0"; + json j_invalid = "ä\xA9ü"; try { std::cout << j_invalid.dump() << std::endl; @@ -39,4 +39,10 @@ int main() { std::cout << e.what() << std::endl; } + + std::cout << "string with replaced invalid characters: " + << j_invalid.dump(-1, ' ', false, json::error_handler_t::replace) + << "\nstring with ignored invalid characters: " + << j_invalid.dump(-1, ' ', false, json::error_handler_t::ignore) + << '\n'; } diff --git a/doc/examples/dump.link b/doc/examples/dump.link index c072c0d9..bfdb31bb 100644 --- a/doc/examples/dump.link +++ b/doc/examples/dump.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/dump.output b/doc/examples/dump.output index c94eeb02..43009fe6 100644 --- a/doc/examples/dump.output +++ b/doc/examples/dump.output @@ -50,4 +50,6 @@ arrays: strings: "Hellö 😀!" "Hell\u00f6 \ud83d\ude00!" -[json.exception.type_error.316] invalid UTF-8 byte at index 3: 0xC0 +[json.exception.type_error.316] invalid UTF-8 byte at index 2: 0xA9 +string with replaced invalid characters: "ä�ü" +string with ignored invalid characters: "äü" From e2c5913a5067c1868f732184944d14d747c68bbe Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 24 Oct 2018 15:43:37 +0200 Subject: [PATCH 55/77] :construction: some changes to the BSON code - added fuzz testers - added some reference files - made an exception text more clear --- Makefile | 9 ++ include/nlohmann/detail/meta/type_traits.hpp | 12 +- .../nlohmann/detail/output/binary_writer.hpp | 20 +++- single_include/nlohmann/json.hpp | 32 ++++-- test/Makefile | 6 +- test/data/json.org/1.json.bson | Bin 0 -> 393 bytes test/data/json.org/2.json.bson | Bin 0 -> 216 bytes test/data/json.org/3.json.bson | Bin 0 -> 406 bytes test/data/json.org/4.json.bson | Bin 0 -> 2786 bytes test/data/json.org/5.json.bson | Bin 0 -> 730 bytes test/data/json_tests/pass3.json.bson | Bin 0 -> 123 bytes test/src/fuzzer-parse_bson.cpp | 68 ++++++++++++ test/src/unit-bson.cpp | 103 ++++++++++++++++-- 13 files changed, 218 insertions(+), 32 deletions(-) create mode 100644 test/data/json.org/1.json.bson create mode 100644 test/data/json.org/2.json.bson create mode 100644 test/data/json.org/3.json.bson create mode 100644 test/data/json.org/4.json.bson create mode 100644 test/data/json.org/5.json.bson create mode 100644 test/data/json_tests/pass3.json.bson create mode 100644 test/src/fuzzer-parse_bson.cpp diff --git a/Makefile b/Makefile index 135db65a..b6784151 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,7 @@ all: @echo "cppcheck - analyze code with cppcheck" @echo "doctest - compile example files and check their output" @echo "fuzz_testing - prepare fuzz testing of the JSON parser" + @echo "fuzz_testing_bson - prepare fuzz testing of the BSON parser" @echo "fuzz_testing_cbor - prepare fuzz testing of the CBOR parser" @echo "fuzz_testing_msgpack - prepare fuzz testing of the MessagePack parser" @echo "fuzz_testing_ubjson - prepare fuzz testing of the UBJSON parser" @@ -220,6 +221,14 @@ fuzz_testing: find test/data/json_tests -size -5k -name *json | xargs -I{} cp "{}" fuzz-testing/testcases @echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer" +fuzz_testing_bson: + rm -fr fuzz-testing + mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out + $(MAKE) parse_bson_fuzzer -C test CXX=afl-clang++ + mv test/parse_bson_fuzzer fuzz-testing/fuzzer + find test/data -size -5k -name *.bson | xargs -I{} cp "{}" fuzz-testing/testcases + @echo "Execute: afl-fuzz -i fuzz-testing/testcases -o fuzz-testing/out fuzz-testing/fuzzer" + fuzz_testing_cbor: rm -fr fuzz-testing mkdir -p fuzz-testing fuzz-testing/testcases fuzz-testing/out diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index efe878f6..4c4c4d3d 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -193,13 +193,13 @@ struct is_constructible_object_type_impl < static constexpr bool value = std::is_constructible::value and - std::is_same::value or - (has_from_json::value or - has_non_default_from_json < - BasicJsonType, - typename ConstructibleObjectType::mapped_type >::value); + (has_from_json::value or + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value)); }; template diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index bebfa936..7f9f0be3 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -976,14 +976,22 @@ class binary_writer { switch (j.type()) { - default: - JSON_THROW(type_error::create(317, "JSON value of type " + std::to_string(static_cast(j.type())) + " cannot be serialized to requested format")); - break; - case value_t::discarded: - break; case value_t::object: + { write_bson_object(*j.m_value.object); break; + } + + case value_t::discarded: + { + break; + } + + default: + { + JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); + break; + } } } @@ -1009,7 +1017,7 @@ class binary_writer std::memcpy(vec.data(), &n, sizeof(NumberType)); // step 2: write array to output (with possible reordering) - if (is_little_endian && !OutputIsLittleEndian) + if (is_little_endian and not OutputIsLittleEndian) { // reverse byte order prior to conversion if necessary std::reverse(vec.begin(), vec.end()); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 29f0cd0d..0664cc75 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -553,13 +553,13 @@ struct is_constructible_object_type_impl < static constexpr bool value = std::is_constructible::value and - std::is_same::value or - (has_from_json::value or - has_non_default_from_json < - BasicJsonType, - typename ConstructibleObjectType::mapped_type >::value); + (has_from_json::value or + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value)); }; template @@ -9234,14 +9234,22 @@ class binary_writer { switch (j.type()) { - default: - JSON_THROW(type_error::create(317, "JSON value of type " + std::to_string(static_cast(j.type())) + " cannot be serialized to requested format")); - break; - case value_t::discarded: - break; case value_t::object: + { write_bson_object(*j.m_value.object); break; + } + + case value_t::discarded: + { + break; + } + + default: + { + JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); + break; + } } } @@ -9267,7 +9275,7 @@ class binary_writer std::memcpy(vec.data(), &n, sizeof(NumberType)); // step 2: write array to output (with possible reordering) - if (is_little_endian && !OutputIsLittleEndian) + if (is_little_endian and not OutputIsLittleEndian) { // reverse byte order prior to conversion if necessary std::reverse(vec.begin(), vec.end()); diff --git a/test/Makefile b/test/Makefile index afbb1ba5..4f00cbc7 100644 --- a/test/Makefile +++ b/test/Makefile @@ -10,6 +10,7 @@ SOURCES = src/unit.cpp \ src/unit-algorithms.cpp \ src/unit-allocator.cpp \ src/unit-alt-string.cpp \ + src/unit-bson.cpp \ src/unit-capacity.cpp \ src/unit-cbor.cpp \ src/unit-class_const_iterator.cpp \ @@ -90,12 +91,15 @@ check: $(OBJECTS) $(TESTCASES) ############################################################################## FUZZER_ENGINE = src/fuzzer-driver_afl.cpp -FUZZERS = parse_afl_fuzzer parse_cbor_fuzzer parse_msgpack_fuzzer parse_ubjson_fuzzer +FUZZERS = parse_afl_fuzzer parse_bson_fuzzer parse_cbor_fuzzer parse_msgpack_fuzzer parse_ubjson_fuzzer fuzzers: $(FUZZERS) parse_afl_fuzzer: $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_json.cpp -o $@ +parse_bson_fuzzer: + $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_bson.cpp -o $@ + parse_cbor_fuzzer: $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(FUZZER_ENGINE) src/fuzzer-parse_cbor.cpp -o $@ diff --git a/test/data/json.org/1.json.bson b/test/data/json.org/1.json.bson new file mode 100644 index 0000000000000000000000000000000000000000..e14e9b92304d8a37a803af2e6c870496679aefd6 GIT binary patch literal 393 zcmZ9IF;BxV5QPs@#8!!s?HJeqi4Ksm1qDTsQgsLe>oqw-R40yXr=ne$`PW>UHkDYc z``)wP)A{!d;JnnvIkH>W^%VCMRU252lvd8eY{a+5%jFwk6|Pp6H!uZ&BwJz-JkMVq z=fRUWxi!tUh6}N>c#$51`4fIbn(S*b=1@BW*PGk0NsuC6dCjtpQmu!qnj6S*&dD!MMN!TM69v*R`#?sxft=33008zvFbx0z literal 0 HcmV?d00001 diff --git a/test/data/json.org/3.json.bson b/test/data/json.org/3.json.bson new file mode 100644 index 0000000000000000000000000000000000000000..deb7c5391fc76590baf686212ee5a4407c404dc6 GIT binary patch literal 406 zcmZuuJx{|h5Ir0L14v|N@xTBb+H^#Si3NlZLsh|mgq--|SU7eRUnu1t@CW!8{5vKl z&Mgukb$jpb-Mg>%Er4ucwLyY6#zJE`7{~x1c*tz448j95p`10oMNhEHv|@lgZANkMQxLJQ;DFgxGKrJf;K!XekU#&afsF8l;3Ji9>>#uv1$&&oaJG7q zm)PT`wmYmyR@^uEn=nM2cQE2$nq?e1Rasifb9wxaPvo>HPUJ|Q7H5!0`-*UsMv1g^ z>s89&^zX=;lj&YwhXvd-&KtC*A^1$UTkXHk(Nm7JNwUDjBQ_uNr%tp>@OVdSYa-eaP03l zp`ggjNQYz9rJi5PI-L6Q!(bLJrh$S?2P@uHYi6<8^QkAq#7Hxe{FuI`?>wGHHr%GGP z&2pC~namF}E){zh>I<9wG}jY--Hmm&W-N2-xB?2P^8?4;hr{ViDxL^6pGp4p&gsFL z&s<*#Ba$aehPtz!p7QJew>btn_5ti7nc>aYC?@-EDyM5cK;mS4%H52$$pM~DMw=9AQNYnF)i3m{U76}UKexDeAT#NhuUDz;8+j=V>mU$n)6HaT zwAEABeVI(+u6?Db?S$!$o)1R;Y2{FbKSmSwaE0}KQ6U`Y^hhefzM?!9)>UiA4M*eMN8deuyw^wW6K)0J-cL0;q$=GxijEm)%yLM@lrNN{S{5V0 zK7@`NbV?=b&Kz2MWjv79mB!T2swN1QFYWxbAz{N>_`5wES+z5MjT#I@o}zXC-NHy> zJfuO%Fjb*hKLw6Pvz}EJtYrl^@$4{9WiA@PK7!j+n^8?~Lke}521L5)rVAOYyPbg* zob6Bic)mD%(m6gkii{U_lL>3N6+aC$=)i2Ev{sD7gkU+1)AKV&xbQicakMOk3xNjt-A1S&?_C1ACWO1UR1~ zM%4`j$Mf}OKyMd-0;dDgh6L9m9?%+iO+;@)Np6VPEIeVPx4k*wJAgQ?X%X?8R zq66A~H9a+YF+c9JJ8-%?5qNo?TiKSURnVVr7EcJog&O3ewp7?X8ywrJfQW|@-u;c?U}2*kb<Nx)@}vLm*`L#Hy)Tn};vRA>MkKgD zBy_j9mvb0G6vuKGJ3?PbZM4?VJBVLv=nV5!CcU|3%C7c>f%~=%GZ+~_SKzE|f)cJ?2`17T^*ofA z&D_{kwnXtke-v@w)v}aRy@tfEtu0;i1-BE$+Y(=FJ7>VS@29pAhGx!HifP=rst5_; zi2r`SkIPpo>nTph)~(vcw4pUi+Q~Jjr@pAz0_>j!;MyWy2~K34p*9T9i@_vYEXB|| zQXr$!YwZIiduiRy-Z>Z_C^h*Ki+8;2+21Wu0I literal 0 HcmV?d00001 diff --git a/test/data/json_tests/pass3.json.bson b/test/data/json_tests/pass3.json.bson new file mode 100644 index 0000000000000000000000000000000000000000..a9c07cf31a86c952d6916dc358cb3f545c8b3473 GIT binary patch literal 123 zcmYL>F%E-35Cd1_1@tNW0-C%6iV!KZDHgO6Ah?U}_K;9MA9s}YjQtalTlemt7%V$p z>TW6Et2sa9Ls+!|J}((gE;XCh!KeXoTy643s$n+7!r>nIap+b|?lkwpINIeRCTL1} GHl%-k10(+c literal 0 HcmV?d00001 diff --git a/test/src/fuzzer-parse_bson.cpp b/test/src/fuzzer-parse_bson.cpp new file mode 100644 index 00000000..4ba20dff --- /dev/null +++ b/test/src/fuzzer-parse_bson.cpp @@ -0,0 +1,68 @@ +/* + __ _____ _____ _____ + __| | __| | | | JSON for Modern C++ (fuzz test support) +| | |__ | | | | | | version 3.3.0 +|_____|_____|_____|_|___| https://github.com/nlohmann/json + +This file implements a parser test suitable for fuzz testing. Given a byte +array data, it performs the following steps: + +- j1 = from_bson(data) +- vec = to_bson(j1) +- j2 = from_bson(vec) +- assert(j1 == j2) + +The provided function `LLVMFuzzerTestOneInput` can be used in different fuzzer +drivers. + +Licensed under the MIT License . +*/ + +#include +#include +#include + +using json = nlohmann::json; + +// see http://llvm.org/docs/LibFuzzer.html +extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) +{ + try + { + // step 1: parse input + std::vector vec1(data, data + size); + json j1 = json::from_bson(vec1); + + try + { + // step 2: round trip + std::vector vec2 = json::to_bson(j1); + + // parse serialization + json j2 = json::from_bson(vec2); + + // serializations must match + assert(json::to_bson(j2) == vec2); + } + catch (const json::parse_error&) + { + // parsing a CBOR serialization must not fail + assert(false); + } + } + catch (const json::parse_error&) + { + // parse errors are ok, because input may be random bytes + } + catch (const json::type_error&) + { + // type errors can occur during parsing, too + } + catch (const json::out_of_range&) + { + // out of range errors can occur during parsing, too + } + + // return 0 - non-zero return values are reserved for future use + return 0; +} diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 3449b698..ef94a807 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -49,7 +49,7 @@ TEST_CASE("BSON") { json j = nullptr; REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 0 cannot be serialized to requested format"); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is null"); } SECTION("boolean") @@ -58,14 +58,14 @@ TEST_CASE("BSON") { json j = true; REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 4 cannot be serialized to requested format"); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is boolean"); } SECTION("false") { json j = false; REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 4 cannot be serialized to requested format"); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is boolean"); } } @@ -73,28 +73,28 @@ TEST_CASE("BSON") { json j = 42; REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 5 cannot be serialized to requested format"); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number"); } SECTION("float") { json j = 4.2; REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 7 cannot be serialized to requested format"); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number"); } SECTION("string") { json j = "not supported"; REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 3 cannot be serialized to requested format"); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is string"); } SECTION("array") { json j = std::vector {1, 2, 3, 4, 5, 6, 7}; REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] JSON value of type 2 cannot be serialized to requested format"); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is array"); } } @@ -1126,3 +1126,92 @@ TEST_CASE("BSON numerical data") } } } + +TEST_CASE("BSON roundtrips", "[hide]") +{ + SECTION("reference files") + { + for (std::string filename : + { + "test/data/json.org/1.json", + "test/data/json.org/2.json", + "test/data/json.org/3.json", + "test/data/json.org/4.json", + "test/data/json.org/5.json" + }) + { + CAPTURE(filename); + + SECTION(filename + ": std::vector") + { + // parse JSON file + std::ifstream f_json(filename); + json j1 = json::parse(f_json); + + // parse BSON file + std::ifstream f_bson(filename + ".bson", std::ios::binary); + std::vector packed( + (std::istreambuf_iterator(f_bson)), + std::istreambuf_iterator()); + json j2; + CHECK_NOTHROW(j2 = json::from_bson(packed)); + + // compare parsed JSON values + CHECK(j1 == j2); + } + + SECTION(filename + ": std::ifstream") + { + // parse JSON file + std::ifstream f_json(filename); + json j1 = json::parse(f_json); + + // parse BSON file + std::ifstream f_bson(filename + ".bson", std::ios::binary); + json j2; + CHECK_NOTHROW(j2 = json::from_bson(f_bson)); + + // compare parsed JSON values + CHECK(j1 == j2); + } + + SECTION(filename + ": uint8_t* and size") + { + // parse JSON file + std::ifstream f_json(filename); + json j1 = json::parse(f_json); + + // parse BSON file + std::ifstream f_bson(filename + ".bson", std::ios::binary); + std::vector packed( + (std::istreambuf_iterator(f_bson)), + std::istreambuf_iterator()); + json j2; + CHECK_NOTHROW(j2 = json::from_bson({packed.data(), packed.size()})); + + // compare parsed JSON values + CHECK(j1 == j2); + } + + SECTION(filename + ": output to output adapters") + { + // parse JSON file + std::ifstream f_json(filename); + json j1 = json::parse(f_json); + + // parse BSON file + std::ifstream f_bson(filename + ".bson", std::ios::binary); + std::vector packed( + (std::istreambuf_iterator(f_bson)), + std::istreambuf_iterator()); + + SECTION(filename + ": output adapters: std::vector") + { + std::vector vec; + json::to_bson(j1, vec); + CHECK(vec == packed); + } + } + } + } +} From 4d1eaace8cc1166f82b867f61650f25f32018919 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 24 Oct 2018 18:55:08 +0200 Subject: [PATCH 56/77] :hammer: fixed fuzz code to avoid false positives in case of discarded values --- test/src/fuzzer-parse_bson.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/src/fuzzer-parse_bson.cpp b/test/src/fuzzer-parse_bson.cpp index 4ba20dff..1d933767 100644 --- a/test/src/fuzzer-parse_bson.cpp +++ b/test/src/fuzzer-parse_bson.cpp @@ -33,6 +33,11 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) std::vector vec1(data, data + size); json j1 = json::from_bson(vec1); + if (j1.is_discarded()) + { + return 0; + } + try { // step 2: round trip From 1968e5c7939ad63262de6649a7ee8c6f50aecaff Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 24 Oct 2018 23:39:30 +0200 Subject: [PATCH 57/77] :art: clean up binary formats --- .../nlohmann/detail/input/binary_reader.hpp | 790 ++++++------ .../nlohmann/detail/output/binary_writer.hpp | 312 +++-- single_include/nlohmann/json.hpp | 1102 +++++++++-------- test/src/unit-bson.cpp | 184 +-- test/src/unit-regression.cpp | 8 +- 5 files changed, 1274 insertions(+), 1122 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index c213d855..615ab73c 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -125,14 +125,38 @@ class binary_reader } private: + ////////// + // BSON // + ////////// + + /*! + @brief Reads in a BSON-object and passes it to the SAX-parser. + @return whether a valid BSON-value was passed to the SAX parser + */ + bool parse_bson_internal() + { + std::int32_t documentSize; + get_number(input_format_t::bson, documentSize); + + if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1)))) + { + return false; + } + + if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/false))) + { + return false; + } + + return sax->end_object(); + } /*! @brief Parses a C-style string from the BSON input. - @param [out] result A reference to the string variable where the read string - is to be stored. - @return `true` if the \x00-byte indicating the end of the - string was encountered before the EOF. - `false` indicates an unexpected EOF. + @param[in, out] result A reference to the string variable where the read + string is to be stored. + @return `true` if the \x00-byte indicating the end of the string was + encountered before the EOF; false` indicates an unexpected EOF. */ bool get_bson_cstr(string_t& result) { @@ -155,107 +179,107 @@ class binary_reader } /*! - @brief Parses a zero-terminated string of length @a len from the BSON input. - @param [in] len The length (including the zero-byte at the end) of the string to be read. - @param [out] result A reference to the string variable where the read string - is to be stored. + @brief Parses a zero-terminated string of length @a len from the BSON + input. + @param[in] len The length (including the zero-byte at the end) of the + string to be read. + @param[in, out] result A reference to the string variable where the read + string is to be stored. @tparam NumberType The type of the length @a len @pre len > 0 @return `true` if the string was successfully parsed */ - template + template bool get_bson_string(const NumberType len, string_t& result) { - return get_string(input_format_t::bson, len - static_cast(1), result) - && get() != std::char_traits::eof(); - } - - /*! - @return A hexadecimal string representation of the given @a byte - @param byte The byte to convert to a string - */ - static std::string byte_hexstring(unsigned char byte) - { - char cr[3]; - snprintf(cr, sizeof(cr), "%02hhX", byte); - return std::string{cr}; + return get_string(input_format_t::bson, len - static_cast(1), result) and get() != std::char_traits::eof(); } /*! @brief Read a BSON document element of the given @a element_type. - @param element_type The BSON element type, c.f. http://bsonspec.org/spec.html - @param element_type_parse_position The position in the input stream, where the `element_type` was read. - @warning Not all BSON element types are supported yet. An unsupported @a element_type will - give rise to a parse_error.114: Unsupported BSON record type 0x... + @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html + @param[in] element_type_parse_position The position in the input stream, + where the `element_type` was read. + @warning Not all BSON element types are supported yet. An unsupported + @a element_type will give rise to a parse_error.114: + Unsupported BSON record type 0x... @return whether a valid BSON-object/array was passed to the SAX parser */ - bool parse_bson_element_internal(int element_type, std::size_t element_type_parse_position) + bool parse_bson_element_internal(const int element_type, + const std::size_t element_type_parse_position) { switch (element_type) { case 0x01: // double { double number; - return get_number(input_format_t::bson, number) - && sax->number_float(static_cast(number), ""); + return get_number(input_format_t::bson, number) and sax->number_float(static_cast(number), ""); } + case 0x02: // string { std::int32_t len; string_t value; - return get_number(input_format_t::bson, len) - && get_bson_string(len, value) - && sax->string(value); - } - case 0x08: // boolean - { - return sax->boolean(static_cast(get())); - } - case 0x10: // int32 - { - std::int32_t value; - return get_number(input_format_t::bson, value) - && sax->number_integer(static_cast(value)); - } - case 0x12: // int64 - { - std::int64_t value; - return get_number(input_format_t::bson, value) - && sax->number_integer(static_cast(value)); - } - case 0x0A: // null - { - return sax->null(); + return get_number(input_format_t::bson, len) and get_bson_string(len, value) and sax->string(value); } + case 0x03: // object { return parse_bson_internal(); } + case 0x04: // array { return parse_bson_array(); } + + case 0x08: // boolean + { + return sax->boolean(static_cast(get())); + } + + case 0x0A: // null + { + return sax->null(); + } + + case 0x10: // int32 + { + std::int32_t value; + return get_number(input_format_t::bson, value) and sax->number_integer(static_cast(value)); + } + + case 0x12: // int64 + { + std::int64_t value; + return get_number(input_format_t::bson, value) and sax->number_integer(static_cast(value)); + } + default: // anything else not supported (yet) { - auto element_type_str = byte_hexstring(element_type); - return sax->parse_error(element_type_parse_position, element_type_str, parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + element_type_str)); + char cr[3]; + snprintf(cr, sizeof(cr), "%.2hhX", static_cast(element_type)); + return sax->parse_error(element_type_parse_position, std::string(cr), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr))); } } } /*! - @brief Read a BSON element list (as specified in the BSON-spec) from the input - and passes it to the SAX-parser. - The same binary layout is used for objects and arrays, hence it must - be indicated with the argument @a is_array which one is expected - (true --> array, false --> object). - @param is_array Determines if the element list being read is to be treated as - an object (@a is_array == false), or as an array (@a is_array == true). + @brief Read a BSON element list (as specified in the BSON-spec) + + The same binary layout is used for objects and arrays, hence it must be + indicated with the argument @a is_array which one is expected + (true --> array, false --> object). + + @param[in] is_array Determines if the element list being read is to be + treated as an object (@a is_array == false), or as an + array (@a is_array == true). @return whether a valid BSON-object/array was passed to the SAX parser */ - bool parse_bson_element_list(bool is_array) + bool parse_bson_element_list(const bool is_array) { - while (auto element_type = get()) + string_t key; + while (int element_type = get()) { if (JSON_UNLIKELY(not unexpect_eof(input_format_t::bson, "element list"))) { @@ -263,13 +287,12 @@ class binary_reader } const std::size_t element_type_parse_position = chars_read; - string_t key; if (JSON_UNLIKELY(not get_bson_cstr(key))) { return false; } - if (!is_array) + if (not is_array) { sax->key(key); } @@ -278,7 +301,11 @@ class binary_reader { return false; } + + // get_bson_cstr only appends + key.clear(); } + return true; } @@ -291,7 +318,7 @@ class binary_reader std::int32_t documentSize; get_number(input_format_t::bson, documentSize); - if (JSON_UNLIKELY(not sax->start_array(-1))) + if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1)))) { return false; } @@ -304,27 +331,9 @@ class binary_reader return sax->end_array(); } - /*! - @brief Reads in a BSON-object and pass it to the SAX-parser. - @return whether a valid BSON-value was passed to the SAX parser - */ - bool parse_bson_internal() - { - std::int32_t documentSize; - get_number(input_format_t::bson, documentSize); - - if (JSON_UNLIKELY(not sax->start_object(-1))) - { - return false; - } - - if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/false))) - { - return false; - } - - return sax->end_object(); - } + ////////// + // CBOR // + ////////// /*! @param[in] get_char whether a new character should be retrieved from the @@ -664,6 +673,191 @@ class binary_reader } } + /*! + @brief reads a CBOR string + + This function first reads starting bytes to determine the expected + string length and then copies this number of bytes into a string. + Additionally, CBOR's strings with indefinite lengths are supported. + + @param[out] result created string + + @return whether string creation completed + */ + bool get_cbor_string(string_t& result) + { + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string"))) + { + return false; + } + + switch (current) + { + // UTF-8 string (0x00..0x17 bytes follow) + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + { + return get_string(input_format_t::cbor, current & 0x1F, result); + } + + case 0x78: // UTF-8 string (one-byte uint8_t for n follows) + { + uint8_t len; + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); + } + + case 0x79: // UTF-8 string (two-byte uint16_t for n follow) + { + uint16_t len; + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); + } + + case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) + { + uint32_t len; + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); + } + + case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) + { + uint64_t len; + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); + } + + case 0x7F: // UTF-8 string (indefinite length) + { + while (get() != 0xFF) + { + string_t chunk; + if (not get_cbor_string(chunk)) + { + return false; + } + result.append(chunk); + } + return true; + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"))); + } + } + } + + /*! + @param[in] len the length of the array or std::size_t(-1) for an + array of indefinite size + @return whether array creation completed + */ + bool get_cbor_array(const std::size_t len) + { + if (JSON_UNLIKELY(not sax->start_array(len))) + { + return false; + } + + if (len != std::size_t(-1)) + { + for (std::size_t i = 0; i < len; ++i) + { + if (JSON_UNLIKELY(not parse_cbor_internal())) + { + return false; + } + } + } + else + { + while (get() != 0xFF) + { + if (JSON_UNLIKELY(not parse_cbor_internal(false))) + { + return false; + } + } + } + + return sax->end_array(); + } + + /*! + @param[in] len the length of the object or std::size_t(-1) for an + object of indefinite size + @return whether object creation completed + */ + bool get_cbor_object(const std::size_t len) + { + if (not JSON_UNLIKELY(sax->start_object(len))) + { + return false; + } + + string_t key; + if (len != std::size_t(-1)) + { + for (std::size_t i = 0; i < len; ++i) + { + get(); + if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key))) + { + return false; + } + + if (JSON_UNLIKELY(not parse_cbor_internal())) + { + return false; + } + key.clear(); + } + } + else + { + while (get() != 0xFF) + { + if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key))) + { + return false; + } + + if (JSON_UNLIKELY(not parse_cbor_internal())) + { + return false; + } + key.clear(); + } + } + + return sax->end_object(); + } + + ///////////// + // MsgPack // + ///////////// + /*! @return whether a valid MessagePack value was passed to the SAX parser */ @@ -1026,301 +1220,6 @@ class binary_reader } } - /*! - @param[in] get_char whether a new character should be retrieved from the - input (true, default) or whether the last read - character should be considered instead - - @return whether a valid UBJSON value was passed to the SAX parser - */ - bool parse_ubjson_internal(const bool get_char = true) - { - return get_ubjson_value(get_char ? get_ignore_noop() : current); - } - - /*! - @brief get next character from the input - - This function provides the interface to the used input adapter. It does - not throw in case the input reached EOF, but returns a -'ve valued - `std::char_traits::eof()` in that case. - - @return character read from the input - */ - int get() - { - ++chars_read; - return (current = ia->get_character()); - } - - /*! - @return character read from the input after ignoring all 'N' entries - */ - int get_ignore_noop() - { - do - { - get(); - } - while (current == 'N'); - - return current; - } - - /* - @brief read a number from the input - - @tparam NumberType the type of the number - @param[in] format the current format (for diagnostics) - @param[out] result number of type @a NumberType - - @return whether conversion completed - - @note This function needs to respect the system's endianess, because - bytes in CBOR, MessagePack, and UBJSON are stored in network order - (big endian) and therefore need reordering on little endian systems. - */ - template - bool get_number(const input_format_t format, NumberType& result) - { - // step 1: read input into array with system's byte order - std::array vec; - for (std::size_t i = 0; i < sizeof(NumberType); ++i) - { - get(); - if (JSON_UNLIKELY(not unexpect_eof(format, "number"))) - { - return false; - } - - // reverse byte order prior to conversion if necessary - if (is_little_endian && !InputIsLittleEndian) - { - vec[sizeof(NumberType) - i - 1] = static_cast(current); - } - else - { - vec[i] = static_cast(current); // LCOV_EXCL_LINE - } - } - - // step 2: convert array into number of type T and return - std::memcpy(&result, vec.data(), sizeof(NumberType)); - return true; - } - - - /*! - @brief create a string by reading characters from the input - - @tparam NumberType the type of the number - @param[in] format the current format (for diagnostics) - @param[in] len number of characters to read - @param[out] result string created by reading @a len bytes - - @return whether string creation completed - - @note We can not reserve @a len bytes for the result, because @a len - may be too large. Usually, @ref unexpect_eof() detects the end of - the input before we run out of string memory. - */ - template - bool get_string(const input_format_t format, const NumberType len, string_t& result) - { - bool success = true; - std::generate_n(std::back_inserter(result), len, [this, &success, &format]() - { - get(); - if (JSON_UNLIKELY(not unexpect_eof(format, "string"))) - { - success = false; - } - return static_cast(current); - }); - return success; - } - - /*! - @brief reads a CBOR string - - This function first reads starting bytes to determine the expected - string length and then copies this number of bytes into a string. - Additionally, CBOR's strings with indefinite lengths are supported. - - @param[out] result created string - - @return whether string creation completed - */ - bool get_cbor_string(string_t& result) - { - if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string"))) - { - return false; - } - - switch (current) - { - // UTF-8 string (0x00..0x17 bytes follow) - case 0x60: - case 0x61: - case 0x62: - case 0x63: - case 0x64: - case 0x65: - case 0x66: - case 0x67: - case 0x68: - case 0x69: - case 0x6A: - case 0x6B: - case 0x6C: - case 0x6D: - case 0x6E: - case 0x6F: - case 0x70: - case 0x71: - case 0x72: - case 0x73: - case 0x74: - case 0x75: - case 0x76: - case 0x77: - { - return get_string(input_format_t::cbor, current & 0x1F, result); - } - - case 0x78: // UTF-8 string (one-byte uint8_t for n follows) - { - uint8_t len; - return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); - } - - case 0x79: // UTF-8 string (two-byte uint16_t for n follow) - { - uint16_t len; - return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); - } - - case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) - { - uint32_t len; - return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); - } - - case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) - { - uint64_t len; - return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); - } - - case 0x7F: // UTF-8 string (indefinite length) - { - while (get() != 0xFF) - { - string_t chunk; - if (not get_cbor_string(chunk)) - { - return false; - } - result.append(chunk); - } - return true; - } - - default: - { - auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"))); - } - } - } - - /*! - @param[in] len the length of the array or std::size_t(-1) for an - array of indefinite size - @return whether array creation completed - */ - bool get_cbor_array(const std::size_t len) - { - if (JSON_UNLIKELY(not sax->start_array(len))) - { - return false; - } - - if (len != std::size_t(-1)) - { - for (std::size_t i = 0; i < len; ++i) - { - if (JSON_UNLIKELY(not parse_cbor_internal())) - { - return false; - } - } - } - else - { - while (get() != 0xFF) - { - if (JSON_UNLIKELY(not parse_cbor_internal(false))) - { - return false; - } - } - } - - return sax->end_array(); - } - - /*! - @param[in] len the length of the object or std::size_t(-1) for an - object of indefinite size - @return whether object creation completed - */ - bool get_cbor_object(const std::size_t len) - { - if (not JSON_UNLIKELY(sax->start_object(len))) - { - return false; - } - - string_t key; - if (len != std::size_t(-1)) - { - for (std::size_t i = 0; i < len; ++i) - { - get(); - if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key))) - { - return false; - } - - if (JSON_UNLIKELY(not parse_cbor_internal())) - { - return false; - } - key.clear(); - } - } - else - { - while (get() != 0xFF) - { - if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key))) - { - return false; - } - - if (JSON_UNLIKELY(not parse_cbor_internal())) - { - return false; - } - key.clear(); - } - } - - return sax->end_object(); - } - /*! @brief reads a MessagePack string @@ -1455,6 +1354,22 @@ class binary_reader return sax->end_object(); } + //////////// + // UBJSON // + //////////// + + /*! + @param[in] get_char whether a new character should be retrieved from the + input (true, default) or whether the last read + character should be considered instead + + @return whether a valid UBJSON value was passed to the SAX parser + */ + bool parse_ubjson_internal(const bool get_char = true) + { + return get_ubjson_value(get_char ? get_ignore_noop() : current); + } + /*! @brief reads a UBJSON string @@ -1869,6 +1784,113 @@ class binary_reader return sax->end_object(); } + /////////////////////// + // Utility functions // + /////////////////////// + + /*! + @brief get next character from the input + + This function provides the interface to the used input adapter. It does + not throw in case the input reached EOF, but returns a -'ve valued + `std::char_traits::eof()` in that case. + + @return character read from the input + */ + int get() + { + ++chars_read; + return (current = ia->get_character()); + } + + /*! + @return character read from the input after ignoring all 'N' entries + */ + int get_ignore_noop() + { + do + { + get(); + } + while (current == 'N'); + + return current; + } + + /* + @brief read a number from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[out] result number of type @a NumberType + + @return whether conversion completed + + @note This function needs to respect the system's endianess, because + bytes in CBOR, MessagePack, and UBJSON are stored in network order + (big endian) and therefore need reordering on little endian systems. + */ + template + bool get_number(const input_format_t format, NumberType& result) + { + // step 1: read input into array with system's byte order + std::array vec; + for (std::size_t i = 0; i < sizeof(NumberType); ++i) + { + get(); + if (JSON_UNLIKELY(not unexpect_eof(format, "number"))) + { + return false; + } + + // reverse byte order prior to conversion if necessary + if (is_little_endian && !InputIsLittleEndian) + { + vec[sizeof(NumberType) - i - 1] = static_cast(current); + } + else + { + vec[i] = static_cast(current); // LCOV_EXCL_LINE + } + } + + // step 2: convert array into number of type T and return + std::memcpy(&result, vec.data(), sizeof(NumberType)); + return true; + } + + /*! + @brief create a string by reading characters from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[in] len number of characters to read + @param[out] result string created by reading @a len bytes + + @return whether string creation completed + + @note We can not reserve @a len bytes for the result, because @a len + may be too large. Usually, @ref unexpect_eof() detects the end of + the input before we run out of string memory. + */ + template + bool get_string(const input_format_t format, + const NumberType len, + string_t& result) + { + bool success = true; + std::generate_n(std::back_inserter(result), len, [this, &success, &format]() + { + get(); + if (JSON_UNLIKELY(not unexpect_eof(format, "string"))) + { + success = false; + } + return static_cast(current); + }); + return success; + } + /*! @param[in] format the current format (for diagnostics) @param[in] context further context information (for diagnostics) @@ -1894,7 +1916,6 @@ class binary_reader return std::string{cr}; } - private: /*! @param[in] format the current format @param[in] detail a detailed error message @@ -1934,6 +1955,7 @@ class binary_reader return error_msg + " " + context + ": " + detail; } + private: /// input adapter input_adapter_t ia = nullptr; diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 7f9f0be3..64a02aac 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -35,7 +35,34 @@ class binary_writer } /*! - @brief[in] j JSON value to serialize + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson(const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::object: + { + write_bson_object(*j.m_value.object); + break; + } + + case value_t::discarded: + { + break; + } + + default: + { + JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); + break; + } + } + } + + /*! + @param[in] j JSON value to serialize */ void write_cbor(const BasicJsonType& j) { @@ -279,7 +306,7 @@ class binary_writer } /*! - @brief[in] j JSON value to serialize + @param[in] j JSON value to serialize */ void write_msgpack(const BasicJsonType& j) { @@ -678,13 +705,19 @@ class binary_writer } } + private: + ////////// + // BSON // + ////////// + /*! - @return The size of a BSON document entry header, including the id marker and the entry name size (and its null-terminator). + @return The size of a BSON document entry header, including the id marker + and the entry name size (and its null-terminator). */ static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { const auto it = name.find(static_cast(0)); - if (it != BasicJsonType::string_t::npos) + if (JSON_UNLIKELY(it != BasicJsonType::string_t::npos)) { JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")")); @@ -696,7 +729,8 @@ class binary_writer /*! @brief Writes the given @a element_type and @a name to the output adapter */ - void write_bson_entry_header(const typename BasicJsonType::string_t& name, std::uint8_t element_type) + void write_bson_entry_header(const typename BasicJsonType::string_t& name, + std::uint8_t element_type) { oa->write_character(static_cast(element_type)); // boolean oa->write_characters( @@ -707,7 +741,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and boolean value @a value */ - void write_bson_boolean(const typename BasicJsonType::string_t& name, const bool value) + void write_bson_boolean(const typename BasicJsonType::string_t& name, + const bool value) { write_bson_entry_header(name, 0x08); oa->write_character(value ? static_cast(0x01) : static_cast(0x00)); @@ -716,7 +751,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and double value @a value */ - void write_bson_double(const typename BasicJsonType::string_t& name, const double value) + void write_bson_double(const typename BasicJsonType::string_t& name, + const double value) { write_bson_entry_header(name, 0x01); write_number(value); @@ -733,7 +769,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and string value @a value */ - void write_bson_string(const typename BasicJsonType::string_t& name, const typename BasicJsonType::string_t& value) + void write_bson_string(const typename BasicJsonType::string_t& name, + const typename BasicJsonType::string_t& value) { write_bson_entry_header(name, 0x02); @@ -769,7 +806,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and integer @a value */ - void write_bson_integer(const typename BasicJsonType::string_t& name, const std::int64_t value) + void write_bson_integer(const typename BasicJsonType::string_t& name, + const std::int64_t value) { if ((std::numeric_limits::min)() <= value and value <= (std::numeric_limits::max)()) { @@ -783,7 +821,6 @@ class binary_writer } } - /*! @return The size of the BSON-encoded unsigned integer in @a j */ @@ -802,7 +839,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and unsigned @a value */ - void write_bson_unsigned(const typename BasicJsonType::string_t& name, const std::uint64_t value) + void write_bson_unsigned(const typename BasicJsonType::string_t& name, + const std::uint64_t value) { if (value <= static_cast((std::numeric_limits::max)())) { @@ -824,13 +862,13 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and object @a value */ - void write_bson_object_entry(const typename BasicJsonType::string_t& name, const typename BasicJsonType::object_t& value) + void write_bson_object_entry(const typename BasicJsonType::string_t& name, + const typename BasicJsonType::object_t& value) { write_bson_entry_header(name, 0x03); // object write_bson_object(value); } - /*! @return The size of the BSON-encoded array @a value */ @@ -849,10 +887,11 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and array @a value */ - void write_bson_array(const typename BasicJsonType::string_t& name, const typename BasicJsonType::array_t& value) + void write_bson_array(const typename BasicJsonType::string_t& name, + const typename BasicJsonType::array_t& value) { write_bson_entry_header(name, 0x04); // array - write_number(calc_bson_array_size(value)); + write_number(static_cast(calc_bson_array_size(value))); for (const auto& el : value) { @@ -862,75 +901,95 @@ class binary_writer oa->write_character(static_cast(0x00)); } - /*! @brief Calculates the size necessary to serialize the JSON value @a j with its @a name @return The calculated size for the BSON document entry for @a j with the given @a name. */ - static std::size_t calc_bson_element_size(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + static std::size_t calc_bson_element_size(const typename BasicJsonType::string_t& name, + const BasicJsonType& j) { const auto header_size = calc_bson_entry_header_size(name); switch (j.type()) { + case value_t::discarded: + return 0ul; + + case value_t::object: + return header_size + calc_bson_object_size(*j.m_value.object); + + case value_t::array: + return header_size + calc_bson_array_size(*j.m_value.array); + + case value_t::boolean: + return header_size + 1ul; + + case value_t::number_float: + return header_size + 8ul; + + case value_t::number_integer: + return header_size + calc_bson_integer_size(j.m_value.number_integer); + + case value_t::number_unsigned: + return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned); + + case value_t::string: + return header_size + calc_bson_string_size(*j.m_value.string); + + case value_t::null: + return header_size + 0ul; + // LCOV_EXCL_START default: assert(false); return 0ul; - // LCOV_EXCL_STOP - case value_t::discarded: - return 0ul; - case value_t::object: - return header_size + calc_bson_object_size(*j.m_value.object); - case value_t::array: - return header_size + calc_bson_array_size(*j.m_value.array); - case value_t::boolean: - return header_size + 1ul; - case value_t::number_float: - return header_size + 8ul; - case value_t::number_integer: - return header_size + calc_bson_integer_size(j.m_value.number_integer); - case value_t::number_unsigned: - return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned); - case value_t::string: - return header_size + calc_bson_string_size(*j.m_value.string); - case value_t::null: - return header_size + 0ul; + // LCOV_EXCL_STOP }; } - /*! - @brief Serializes the JSON value @a j to BSON and associates it with the key @a name. - @param name The name to associate with the JSON entity @a j within the current BSON document - @return The size of the bson entry + @brief Serializes the JSON value @a j to BSON and associates it with the + key @a name. + @param name The name to associate with the JSON entity @a j within the + current BSON document + @return The size of the BSON entry */ - void write_bson_element(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + void write_bson_element(const typename BasicJsonType::string_t& name, + const BasicJsonType& j) { switch (j.type()) { + case value_t::discarded: + return; + + case value_t::object: + return write_bson_object_entry(name, *j.m_value.object); + + case value_t::array: + return write_bson_array(name, *j.m_value.array); + + case value_t::boolean: + return write_bson_boolean(name, j.m_value.boolean); + + case value_t::number_float: + return write_bson_double(name, j.m_value.number_float); + + case value_t::number_integer: + return write_bson_integer(name, j.m_value.number_integer); + + case value_t::number_unsigned: + return write_bson_unsigned(name, j.m_value.number_unsigned); + + case value_t::string: + return write_bson_string(name, *j.m_value.string); + + case value_t::null: + return write_bson_null(name); + // LCOV_EXCL_START default: assert(false); return; - // LCOV_EXCL_STOP - case value_t::discarded: - return; - case value_t::object: - return write_bson_object_entry(name, *j.m_value.object); - case value_t::array: - return write_bson_array(name, *j.m_value.array); - case value_t::boolean: - return write_bson_boolean(name, j.m_value.boolean); - case value_t::number_float: - return write_bson_double(name, j.m_value.number_float); - case value_t::number_integer: - return write_bson_integer(name, j.m_value.number_integer); - case value_t::number_unsigned: - return write_bson_unsigned(name, j.m_value.number_unsigned); - case value_t::string: - return write_bson_string(name, *j.m_value.string); - case value_t::null: - return write_bson_null(name); + // LCOV_EXCL_STOP }; } @@ -958,7 +1017,7 @@ class binary_writer */ void write_bson_object(const typename BasicJsonType::object_t& value) { - write_number(calc_bson_object_size(value)); + write_number(static_cast(calc_bson_object_size(value))); for (const auto& el : value) { @@ -968,64 +1027,38 @@ class binary_writer oa->write_character(static_cast(0x00)); } - /*! - @param[in] j JSON value to serialize - @pre j.type() == value_t::object - */ - void write_bson(const BasicJsonType& j) + ////////// + // CBOR // + ////////// + + static constexpr CharType get_cbor_float_prefix(float /*unused*/) { - switch (j.type()) - { - case value_t::object: - { - write_bson_object(*j.m_value.object); - break; - } - - case value_t::discarded: - { - break; - } - - default: - { - JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); - break; - } - } + return static_cast(0xFA); // Single-Precision Float } - - private: - /* - @brief write a number to output input - - @param[in] n number of type @a NumberType - @tparam NumberType the type of the number - @tparam OutputIsLittleEndian Set to true if output data is - required to be little endian - - @note This function needs to respect the system's endianess, because bytes - in CBOR, MessagePack, and UBJSON are stored in network order (big - endian) and therefore need reordering on little endian systems. - */ - template - void write_number(const NumberType n) + static constexpr CharType get_cbor_float_prefix(double /*unused*/) { - // step 1: write number to array of length NumberType - std::array vec; - std::memcpy(vec.data(), &n, sizeof(NumberType)); - - // step 2: write array to output (with possible reordering) - if (is_little_endian and not OutputIsLittleEndian) - { - // reverse byte order prior to conversion if necessary - std::reverse(vec.begin(), vec.end()); - } - - oa->write_characters(vec.data(), sizeof(NumberType)); + return static_cast(0xFB); // Double-Precision Float } + ///////////// + // MsgPack // + ///////////// + + static constexpr CharType get_msgpack_float_prefix(float /*unused*/) + { + return static_cast(0xCA); // float 32 + } + + static constexpr CharType get_msgpack_float_prefix(double /*unused*/) + { + return static_cast(0xCB); // float 64 + } + + //////////// + // UBJSON // + //////////// + // UBJSON: write number (floating point) template::value, int>::type = 0> @@ -1226,26 +1259,6 @@ class binary_writer } } - static constexpr CharType get_cbor_float_prefix(float /*unused*/) - { - return static_cast(0xFA); // Single-Precision Float - } - - static constexpr CharType get_cbor_float_prefix(double /*unused*/) - { - return static_cast(0xFB); // Double-Precision Float - } - - static constexpr CharType get_msgpack_float_prefix(float /*unused*/) - { - return static_cast(0xCA); // float 32 - } - - static constexpr CharType get_msgpack_float_prefix(double /*unused*/) - { - return static_cast(0xCB); // float 64 - } - static constexpr CharType get_ubjson_float_prefix(float /*unused*/) { return 'd'; // float 32 @@ -1256,6 +1269,39 @@ class binary_writer return 'D'; // float 64 } + /////////////////////// + // Utility functions // + /////////////////////// + + /* + @brief write a number to output input + + @param[in] n number of type @a NumberType + @tparam NumberType the type of the number + @tparam OutputIsLittleEndian Set to true if output data is + required to be little endian + + @note This function needs to respect the system's endianess, because bytes + in CBOR, MessagePack, and UBJSON are stored in network order (big + endian) and therefore need reordering on little endian systems. + */ + template + void write_number(const NumberType n) + { + // step 1: write number to array of length NumberType + std::array vec; + std::memcpy(vec.data(), &n, sizeof(NumberType)); + + // step 2: write array to output (with possible reordering) + if (is_little_endian and not OutputIsLittleEndian) + { + // reverse byte order prior to conversion if necessary + std::reverse(vec.begin(), vec.end()); + } + + oa->write_characters(vec.data(), sizeof(NumberType)); + } + private: /// whether we can assume little endianess const bool is_little_endian = binary_reader::little_endianess(); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 0664cc75..cdd4e680 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6426,14 +6426,38 @@ class binary_reader } private: + ////////// + // BSON // + ////////// + + /*! + @brief Reads in a BSON-object and passes it to the SAX-parser. + @return whether a valid BSON-value was passed to the SAX parser + */ + bool parse_bson_internal() + { + std::int32_t documentSize; + get_number(input_format_t::bson, documentSize); + + if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1)))) + { + return false; + } + + if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/false))) + { + return false; + } + + return sax->end_object(); + } /*! @brief Parses a C-style string from the BSON input. - @param [out] result A reference to the string variable where the read string - is to be stored. - @return `true` if the \x00-byte indicating the end of the - string was encountered before the EOF. - `false` indicates an unexpected EOF. + @param[in, out] result A reference to the string variable where the read + string is to be stored. + @return `true` if the \x00-byte indicating the end of the string was + encountered before the EOF; false` indicates an unexpected EOF. */ bool get_bson_cstr(string_t& result) { @@ -6456,107 +6480,107 @@ class binary_reader } /*! - @brief Parses a zero-terminated string of length @a len from the BSON input. - @param [in] len The length (including the zero-byte at the end) of the string to be read. - @param [out] result A reference to the string variable where the read string - is to be stored. + @brief Parses a zero-terminated string of length @a len from the BSON + input. + @param[in] len The length (including the zero-byte at the end) of the + string to be read. + @param[in, out] result A reference to the string variable where the read + string is to be stored. @tparam NumberType The type of the length @a len @pre len > 0 @return `true` if the string was successfully parsed */ - template + template bool get_bson_string(const NumberType len, string_t& result) { - return get_string(input_format_t::bson, len - static_cast(1), result) - && get() != std::char_traits::eof(); - } - - /*! - @return A hexadecimal string representation of the given @a byte - @param byte The byte to convert to a string - */ - static std::string byte_hexstring(unsigned char byte) - { - char cr[3]; - snprintf(cr, sizeof(cr), "%02hhX", byte); - return std::string{cr}; + return get_string(input_format_t::bson, len - static_cast(1), result) and get() != std::char_traits::eof(); } /*! @brief Read a BSON document element of the given @a element_type. - @param element_type The BSON element type, c.f. http://bsonspec.org/spec.html - @param element_type_parse_position The position in the input stream, where the `element_type` was read. - @warning Not all BSON element types are supported yet. An unsupported @a element_type will - give rise to a parse_error.114: Unsupported BSON record type 0x... + @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html + @param[in] element_type_parse_position The position in the input stream, + where the `element_type` was read. + @warning Not all BSON element types are supported yet. An unsupported + @a element_type will give rise to a parse_error.114: + Unsupported BSON record type 0x... @return whether a valid BSON-object/array was passed to the SAX parser */ - bool parse_bson_element_internal(int element_type, std::size_t element_type_parse_position) + bool parse_bson_element_internal(const int element_type, + const std::size_t element_type_parse_position) { switch (element_type) { case 0x01: // double { double number; - return get_number(input_format_t::bson, number) - && sax->number_float(static_cast(number), ""); + return get_number(input_format_t::bson, number) and sax->number_float(static_cast(number), ""); } + case 0x02: // string { std::int32_t len; string_t value; - return get_number(input_format_t::bson, len) - && get_bson_string(len, value) - && sax->string(value); - } - case 0x08: // boolean - { - return sax->boolean(static_cast(get())); - } - case 0x10: // int32 - { - std::int32_t value; - return get_number(input_format_t::bson, value) - && sax->number_integer(static_cast(value)); - } - case 0x12: // int64 - { - std::int64_t value; - return get_number(input_format_t::bson, value) - && sax->number_integer(static_cast(value)); - } - case 0x0A: // null - { - return sax->null(); + return get_number(input_format_t::bson, len) and get_bson_string(len, value) and sax->string(value); } + case 0x03: // object { return parse_bson_internal(); } + case 0x04: // array { return parse_bson_array(); } + + case 0x08: // boolean + { + return sax->boolean(static_cast(get())); + } + + case 0x0A: // null + { + return sax->null(); + } + + case 0x10: // int32 + { + std::int32_t value; + return get_number(input_format_t::bson, value) and sax->number_integer(static_cast(value)); + } + + case 0x12: // int64 + { + std::int64_t value; + return get_number(input_format_t::bson, value) and sax->number_integer(static_cast(value)); + } + default: // anything else not supported (yet) { - auto element_type_str = byte_hexstring(element_type); - return sax->parse_error(element_type_parse_position, element_type_str, parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + element_type_str)); + char cr[3]; + snprintf(cr, sizeof(cr), "%.2hhX", static_cast(element_type)); + return sax->parse_error(element_type_parse_position, std::string(cr), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr))); } } } /*! - @brief Read a BSON element list (as specified in the BSON-spec) from the input - and passes it to the SAX-parser. - The same binary layout is used for objects and arrays, hence it must - be indicated with the argument @a is_array which one is expected - (true --> array, false --> object). - @param is_array Determines if the element list being read is to be treated as - an object (@a is_array == false), or as an array (@a is_array == true). + @brief Read a BSON element list (as specified in the BSON-spec) + + The same binary layout is used for objects and arrays, hence it must be + indicated with the argument @a is_array which one is expected + (true --> array, false --> object). + + @param[in] is_array Determines if the element list being read is to be + treated as an object (@a is_array == false), or as an + array (@a is_array == true). @return whether a valid BSON-object/array was passed to the SAX parser */ - bool parse_bson_element_list(bool is_array) + bool parse_bson_element_list(const bool is_array) { - while (auto element_type = get()) + string_t key; + while (int element_type = get()) { if (JSON_UNLIKELY(not unexpect_eof(input_format_t::bson, "element list"))) { @@ -6564,13 +6588,12 @@ class binary_reader } const std::size_t element_type_parse_position = chars_read; - string_t key; if (JSON_UNLIKELY(not get_bson_cstr(key))) { return false; } - if (!is_array) + if (not is_array) { sax->key(key); } @@ -6579,7 +6602,11 @@ class binary_reader { return false; } + + // get_bson_cstr only appends + key.clear(); } + return true; } @@ -6592,7 +6619,7 @@ class binary_reader std::int32_t documentSize; get_number(input_format_t::bson, documentSize); - if (JSON_UNLIKELY(not sax->start_array(-1))) + if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1)))) { return false; } @@ -6605,27 +6632,9 @@ class binary_reader return sax->end_array(); } - /*! - @brief Reads in a BSON-object and pass it to the SAX-parser. - @return whether a valid BSON-value was passed to the SAX parser - */ - bool parse_bson_internal() - { - std::int32_t documentSize; - get_number(input_format_t::bson, documentSize); - - if (JSON_UNLIKELY(not sax->start_object(-1))) - { - return false; - } - - if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/false))) - { - return false; - } - - return sax->end_object(); - } + ////////// + // CBOR // + ////////// /*! @param[in] get_char whether a new character should be retrieved from the @@ -6965,6 +6974,191 @@ class binary_reader } } + /*! + @brief reads a CBOR string + + This function first reads starting bytes to determine the expected + string length and then copies this number of bytes into a string. + Additionally, CBOR's strings with indefinite lengths are supported. + + @param[out] result created string + + @return whether string creation completed + */ + bool get_cbor_string(string_t& result) + { + if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string"))) + { + return false; + } + + switch (current) + { + // UTF-8 string (0x00..0x17 bytes follow) + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6A: + case 0x6B: + case 0x6C: + case 0x6D: + case 0x6E: + case 0x6F: + case 0x70: + case 0x71: + case 0x72: + case 0x73: + case 0x74: + case 0x75: + case 0x76: + case 0x77: + { + return get_string(input_format_t::cbor, current & 0x1F, result); + } + + case 0x78: // UTF-8 string (one-byte uint8_t for n follows) + { + uint8_t len; + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); + } + + case 0x79: // UTF-8 string (two-byte uint16_t for n follow) + { + uint16_t len; + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); + } + + case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) + { + uint32_t len; + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); + } + + case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) + { + uint64_t len; + return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); + } + + case 0x7F: // UTF-8 string (indefinite length) + { + while (get() != 0xFF) + { + string_t chunk; + if (not get_cbor_string(chunk)) + { + return false; + } + result.append(chunk); + } + return true; + } + + default: + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"))); + } + } + } + + /*! + @param[in] len the length of the array or std::size_t(-1) for an + array of indefinite size + @return whether array creation completed + */ + bool get_cbor_array(const std::size_t len) + { + if (JSON_UNLIKELY(not sax->start_array(len))) + { + return false; + } + + if (len != std::size_t(-1)) + { + for (std::size_t i = 0; i < len; ++i) + { + if (JSON_UNLIKELY(not parse_cbor_internal())) + { + return false; + } + } + } + else + { + while (get() != 0xFF) + { + if (JSON_UNLIKELY(not parse_cbor_internal(false))) + { + return false; + } + } + } + + return sax->end_array(); + } + + /*! + @param[in] len the length of the object or std::size_t(-1) for an + object of indefinite size + @return whether object creation completed + */ + bool get_cbor_object(const std::size_t len) + { + if (not JSON_UNLIKELY(sax->start_object(len))) + { + return false; + } + + string_t key; + if (len != std::size_t(-1)) + { + for (std::size_t i = 0; i < len; ++i) + { + get(); + if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key))) + { + return false; + } + + if (JSON_UNLIKELY(not parse_cbor_internal())) + { + return false; + } + key.clear(); + } + } + else + { + while (get() != 0xFF) + { + if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key))) + { + return false; + } + + if (JSON_UNLIKELY(not parse_cbor_internal())) + { + return false; + } + key.clear(); + } + } + + return sax->end_object(); + } + + ///////////// + // MsgPack // + ///////////// + /*! @return whether a valid MessagePack value was passed to the SAX parser */ @@ -7327,301 +7521,6 @@ class binary_reader } } - /*! - @param[in] get_char whether a new character should be retrieved from the - input (true, default) or whether the last read - character should be considered instead - - @return whether a valid UBJSON value was passed to the SAX parser - */ - bool parse_ubjson_internal(const bool get_char = true) - { - return get_ubjson_value(get_char ? get_ignore_noop() : current); - } - - /*! - @brief get next character from the input - - This function provides the interface to the used input adapter. It does - not throw in case the input reached EOF, but returns a -'ve valued - `std::char_traits::eof()` in that case. - - @return character read from the input - */ - int get() - { - ++chars_read; - return (current = ia->get_character()); - } - - /*! - @return character read from the input after ignoring all 'N' entries - */ - int get_ignore_noop() - { - do - { - get(); - } - while (current == 'N'); - - return current; - } - - /* - @brief read a number from the input - - @tparam NumberType the type of the number - @param[in] format the current format (for diagnostics) - @param[out] result number of type @a NumberType - - @return whether conversion completed - - @note This function needs to respect the system's endianess, because - bytes in CBOR, MessagePack, and UBJSON are stored in network order - (big endian) and therefore need reordering on little endian systems. - */ - template - bool get_number(const input_format_t format, NumberType& result) - { - // step 1: read input into array with system's byte order - std::array vec; - for (std::size_t i = 0; i < sizeof(NumberType); ++i) - { - get(); - if (JSON_UNLIKELY(not unexpect_eof(format, "number"))) - { - return false; - } - - // reverse byte order prior to conversion if necessary - if (is_little_endian && !InputIsLittleEndian) - { - vec[sizeof(NumberType) - i - 1] = static_cast(current); - } - else - { - vec[i] = static_cast(current); // LCOV_EXCL_LINE - } - } - - // step 2: convert array into number of type T and return - std::memcpy(&result, vec.data(), sizeof(NumberType)); - return true; - } - - - /*! - @brief create a string by reading characters from the input - - @tparam NumberType the type of the number - @param[in] format the current format (for diagnostics) - @param[in] len number of characters to read - @param[out] result string created by reading @a len bytes - - @return whether string creation completed - - @note We can not reserve @a len bytes for the result, because @a len - may be too large. Usually, @ref unexpect_eof() detects the end of - the input before we run out of string memory. - */ - template - bool get_string(const input_format_t format, const NumberType len, string_t& result) - { - bool success = true; - std::generate_n(std::back_inserter(result), len, [this, &success, &format]() - { - get(); - if (JSON_UNLIKELY(not unexpect_eof(format, "string"))) - { - success = false; - } - return static_cast(current); - }); - return success; - } - - /*! - @brief reads a CBOR string - - This function first reads starting bytes to determine the expected - string length and then copies this number of bytes into a string. - Additionally, CBOR's strings with indefinite lengths are supported. - - @param[out] result created string - - @return whether string creation completed - */ - bool get_cbor_string(string_t& result) - { - if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string"))) - { - return false; - } - - switch (current) - { - // UTF-8 string (0x00..0x17 bytes follow) - case 0x60: - case 0x61: - case 0x62: - case 0x63: - case 0x64: - case 0x65: - case 0x66: - case 0x67: - case 0x68: - case 0x69: - case 0x6A: - case 0x6B: - case 0x6C: - case 0x6D: - case 0x6E: - case 0x6F: - case 0x70: - case 0x71: - case 0x72: - case 0x73: - case 0x74: - case 0x75: - case 0x76: - case 0x77: - { - return get_string(input_format_t::cbor, current & 0x1F, result); - } - - case 0x78: // UTF-8 string (one-byte uint8_t for n follows) - { - uint8_t len; - return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); - } - - case 0x79: // UTF-8 string (two-byte uint16_t for n follow) - { - uint16_t len; - return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); - } - - case 0x7A: // UTF-8 string (four-byte uint32_t for n follow) - { - uint32_t len; - return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); - } - - case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow) - { - uint64_t len; - return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result); - } - - case 0x7F: // UTF-8 string (indefinite length) - { - while (get() != 0xFF) - { - string_t chunk; - if (not get_cbor_string(chunk)) - { - return false; - } - result.append(chunk); - } - return true; - } - - default: - { - auto last_token = get_token_string(); - return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"))); - } - } - } - - /*! - @param[in] len the length of the array or std::size_t(-1) for an - array of indefinite size - @return whether array creation completed - */ - bool get_cbor_array(const std::size_t len) - { - if (JSON_UNLIKELY(not sax->start_array(len))) - { - return false; - } - - if (len != std::size_t(-1)) - { - for (std::size_t i = 0; i < len; ++i) - { - if (JSON_UNLIKELY(not parse_cbor_internal())) - { - return false; - } - } - } - else - { - while (get() != 0xFF) - { - if (JSON_UNLIKELY(not parse_cbor_internal(false))) - { - return false; - } - } - } - - return sax->end_array(); - } - - /*! - @param[in] len the length of the object or std::size_t(-1) for an - object of indefinite size - @return whether object creation completed - */ - bool get_cbor_object(const std::size_t len) - { - if (not JSON_UNLIKELY(sax->start_object(len))) - { - return false; - } - - string_t key; - if (len != std::size_t(-1)) - { - for (std::size_t i = 0; i < len; ++i) - { - get(); - if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key))) - { - return false; - } - - if (JSON_UNLIKELY(not parse_cbor_internal())) - { - return false; - } - key.clear(); - } - } - else - { - while (get() != 0xFF) - { - if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key))) - { - return false; - } - - if (JSON_UNLIKELY(not parse_cbor_internal())) - { - return false; - } - key.clear(); - } - } - - return sax->end_object(); - } - /*! @brief reads a MessagePack string @@ -7756,6 +7655,22 @@ class binary_reader return sax->end_object(); } + //////////// + // UBJSON // + //////////// + + /*! + @param[in] get_char whether a new character should be retrieved from the + input (true, default) or whether the last read + character should be considered instead + + @return whether a valid UBJSON value was passed to the SAX parser + */ + bool parse_ubjson_internal(const bool get_char = true) + { + return get_ubjson_value(get_char ? get_ignore_noop() : current); + } + /*! @brief reads a UBJSON string @@ -8170,6 +8085,113 @@ class binary_reader return sax->end_object(); } + /////////////////////// + // Utility functions // + /////////////////////// + + /*! + @brief get next character from the input + + This function provides the interface to the used input adapter. It does + not throw in case the input reached EOF, but returns a -'ve valued + `std::char_traits::eof()` in that case. + + @return character read from the input + */ + int get() + { + ++chars_read; + return (current = ia->get_character()); + } + + /*! + @return character read from the input after ignoring all 'N' entries + */ + int get_ignore_noop() + { + do + { + get(); + } + while (current == 'N'); + + return current; + } + + /* + @brief read a number from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[out] result number of type @a NumberType + + @return whether conversion completed + + @note This function needs to respect the system's endianess, because + bytes in CBOR, MessagePack, and UBJSON are stored in network order + (big endian) and therefore need reordering on little endian systems. + */ + template + bool get_number(const input_format_t format, NumberType& result) + { + // step 1: read input into array with system's byte order + std::array vec; + for (std::size_t i = 0; i < sizeof(NumberType); ++i) + { + get(); + if (JSON_UNLIKELY(not unexpect_eof(format, "number"))) + { + return false; + } + + // reverse byte order prior to conversion if necessary + if (is_little_endian && !InputIsLittleEndian) + { + vec[sizeof(NumberType) - i - 1] = static_cast(current); + } + else + { + vec[i] = static_cast(current); // LCOV_EXCL_LINE + } + } + + // step 2: convert array into number of type T and return + std::memcpy(&result, vec.data(), sizeof(NumberType)); + return true; + } + + /*! + @brief create a string by reading characters from the input + + @tparam NumberType the type of the number + @param[in] format the current format (for diagnostics) + @param[in] len number of characters to read + @param[out] result string created by reading @a len bytes + + @return whether string creation completed + + @note We can not reserve @a len bytes for the result, because @a len + may be too large. Usually, @ref unexpect_eof() detects the end of + the input before we run out of string memory. + */ + template + bool get_string(const input_format_t format, + const NumberType len, + string_t& result) + { + bool success = true; + std::generate_n(std::back_inserter(result), len, [this, &success, &format]() + { + get(); + if (JSON_UNLIKELY(not unexpect_eof(format, "string"))) + { + success = false; + } + return static_cast(current); + }); + return success; + } + /*! @param[in] format the current format (for diagnostics) @param[in] context further context information (for diagnostics) @@ -8195,7 +8217,6 @@ class binary_reader return std::string{cr}; } - private: /*! @param[in] format the current format @param[in] detail a detailed error message @@ -8235,6 +8256,7 @@ class binary_reader return error_msg + " " + context + ": " + detail; } + private: /// input adapter input_adapter_t ia = nullptr; @@ -8293,7 +8315,34 @@ class binary_writer } /*! - @brief[in] j JSON value to serialize + @param[in] j JSON value to serialize + @pre j.type() == value_t::object + */ + void write_bson(const BasicJsonType& j) + { + switch (j.type()) + { + case value_t::object: + { + write_bson_object(*j.m_value.object); + break; + } + + case value_t::discarded: + { + break; + } + + default: + { + JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); + break; + } + } + } + + /*! + @param[in] j JSON value to serialize */ void write_cbor(const BasicJsonType& j) { @@ -8537,7 +8586,7 @@ class binary_writer } /*! - @brief[in] j JSON value to serialize + @param[in] j JSON value to serialize */ void write_msgpack(const BasicJsonType& j) { @@ -8936,13 +8985,19 @@ class binary_writer } } + private: + ////////// + // BSON // + ////////// + /*! - @return The size of a BSON document entry header, including the id marker and the entry name size (and its null-terminator). + @return The size of a BSON document entry header, including the id marker + and the entry name size (and its null-terminator). */ static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) { const auto it = name.find(static_cast(0)); - if (it != BasicJsonType::string_t::npos) + if (JSON_UNLIKELY(it != BasicJsonType::string_t::npos)) { JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")")); @@ -8954,7 +9009,8 @@ class binary_writer /*! @brief Writes the given @a element_type and @a name to the output adapter */ - void write_bson_entry_header(const typename BasicJsonType::string_t& name, std::uint8_t element_type) + void write_bson_entry_header(const typename BasicJsonType::string_t& name, + std::uint8_t element_type) { oa->write_character(static_cast(element_type)); // boolean oa->write_characters( @@ -8965,7 +9021,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and boolean value @a value */ - void write_bson_boolean(const typename BasicJsonType::string_t& name, const bool value) + void write_bson_boolean(const typename BasicJsonType::string_t& name, + const bool value) { write_bson_entry_header(name, 0x08); oa->write_character(value ? static_cast(0x01) : static_cast(0x00)); @@ -8974,7 +9031,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and double value @a value */ - void write_bson_double(const typename BasicJsonType::string_t& name, const double value) + void write_bson_double(const typename BasicJsonType::string_t& name, + const double value) { write_bson_entry_header(name, 0x01); write_number(value); @@ -8991,7 +9049,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and string value @a value */ - void write_bson_string(const typename BasicJsonType::string_t& name, const typename BasicJsonType::string_t& value) + void write_bson_string(const typename BasicJsonType::string_t& name, + const typename BasicJsonType::string_t& value) { write_bson_entry_header(name, 0x02); @@ -9027,7 +9086,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and integer @a value */ - void write_bson_integer(const typename BasicJsonType::string_t& name, const std::int64_t value) + void write_bson_integer(const typename BasicJsonType::string_t& name, + const std::int64_t value) { if ((std::numeric_limits::min)() <= value and value <= (std::numeric_limits::max)()) { @@ -9041,7 +9101,6 @@ class binary_writer } } - /*! @return The size of the BSON-encoded unsigned integer in @a j */ @@ -9060,7 +9119,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and unsigned @a value */ - void write_bson_unsigned(const typename BasicJsonType::string_t& name, const std::uint64_t value) + void write_bson_unsigned(const typename BasicJsonType::string_t& name, + const std::uint64_t value) { if (value <= static_cast((std::numeric_limits::max)())) { @@ -9082,13 +9142,13 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and object @a value */ - void write_bson_object_entry(const typename BasicJsonType::string_t& name, const typename BasicJsonType::object_t& value) + void write_bson_object_entry(const typename BasicJsonType::string_t& name, + const typename BasicJsonType::object_t& value) { write_bson_entry_header(name, 0x03); // object write_bson_object(value); } - /*! @return The size of the BSON-encoded array @a value */ @@ -9107,10 +9167,11 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and array @a value */ - void write_bson_array(const typename BasicJsonType::string_t& name, const typename BasicJsonType::array_t& value) + void write_bson_array(const typename BasicJsonType::string_t& name, + const typename BasicJsonType::array_t& value) { write_bson_entry_header(name, 0x04); // array - write_number(calc_bson_array_size(value)); + write_number(static_cast(calc_bson_array_size(value))); for (const auto& el : value) { @@ -9120,75 +9181,95 @@ class binary_writer oa->write_character(static_cast(0x00)); } - /*! @brief Calculates the size necessary to serialize the JSON value @a j with its @a name @return The calculated size for the BSON document entry for @a j with the given @a name. */ - static std::size_t calc_bson_element_size(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + static std::size_t calc_bson_element_size(const typename BasicJsonType::string_t& name, + const BasicJsonType& j) { const auto header_size = calc_bson_entry_header_size(name); switch (j.type()) { + case value_t::discarded: + return 0ul; + + case value_t::object: + return header_size + calc_bson_object_size(*j.m_value.object); + + case value_t::array: + return header_size + calc_bson_array_size(*j.m_value.array); + + case value_t::boolean: + return header_size + 1ul; + + case value_t::number_float: + return header_size + 8ul; + + case value_t::number_integer: + return header_size + calc_bson_integer_size(j.m_value.number_integer); + + case value_t::number_unsigned: + return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned); + + case value_t::string: + return header_size + calc_bson_string_size(*j.m_value.string); + + case value_t::null: + return header_size + 0ul; + // LCOV_EXCL_START default: assert(false); return 0ul; - // LCOV_EXCL_STOP - case value_t::discarded: - return 0ul; - case value_t::object: - return header_size + calc_bson_object_size(*j.m_value.object); - case value_t::array: - return header_size + calc_bson_array_size(*j.m_value.array); - case value_t::boolean: - return header_size + 1ul; - case value_t::number_float: - return header_size + 8ul; - case value_t::number_integer: - return header_size + calc_bson_integer_size(j.m_value.number_integer); - case value_t::number_unsigned: - return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned); - case value_t::string: - return header_size + calc_bson_string_size(*j.m_value.string); - case value_t::null: - return header_size + 0ul; + // LCOV_EXCL_STOP }; } - /*! - @brief Serializes the JSON value @a j to BSON and associates it with the key @a name. - @param name The name to associate with the JSON entity @a j within the current BSON document - @return The size of the bson entry + @brief Serializes the JSON value @a j to BSON and associates it with the + key @a name. + @param name The name to associate with the JSON entity @a j within the + current BSON document + @return The size of the BSON entry */ - void write_bson_element(const typename BasicJsonType::string_t& name, const BasicJsonType& j) + void write_bson_element(const typename BasicJsonType::string_t& name, + const BasicJsonType& j) { switch (j.type()) { + case value_t::discarded: + return; + + case value_t::object: + return write_bson_object_entry(name, *j.m_value.object); + + case value_t::array: + return write_bson_array(name, *j.m_value.array); + + case value_t::boolean: + return write_bson_boolean(name, j.m_value.boolean); + + case value_t::number_float: + return write_bson_double(name, j.m_value.number_float); + + case value_t::number_integer: + return write_bson_integer(name, j.m_value.number_integer); + + case value_t::number_unsigned: + return write_bson_unsigned(name, j.m_value.number_unsigned); + + case value_t::string: + return write_bson_string(name, *j.m_value.string); + + case value_t::null: + return write_bson_null(name); + // LCOV_EXCL_START default: assert(false); return; - // LCOV_EXCL_STOP - case value_t::discarded: - return; - case value_t::object: - return write_bson_object_entry(name, *j.m_value.object); - case value_t::array: - return write_bson_array(name, *j.m_value.array); - case value_t::boolean: - return write_bson_boolean(name, j.m_value.boolean); - case value_t::number_float: - return write_bson_double(name, j.m_value.number_float); - case value_t::number_integer: - return write_bson_integer(name, j.m_value.number_integer); - case value_t::number_unsigned: - return write_bson_unsigned(name, j.m_value.number_unsigned); - case value_t::string: - return write_bson_string(name, *j.m_value.string); - case value_t::null: - return write_bson_null(name); + // LCOV_EXCL_STOP }; } @@ -9216,7 +9297,7 @@ class binary_writer */ void write_bson_object(const typename BasicJsonType::object_t& value) { - write_number(calc_bson_object_size(value)); + write_number(static_cast(calc_bson_object_size(value))); for (const auto& el : value) { @@ -9226,64 +9307,38 @@ class binary_writer oa->write_character(static_cast(0x00)); } - /*! - @param[in] j JSON value to serialize - @pre j.type() == value_t::object - */ - void write_bson(const BasicJsonType& j) + ////////// + // CBOR // + ////////// + + static constexpr CharType get_cbor_float_prefix(float /*unused*/) { - switch (j.type()) - { - case value_t::object: - { - write_bson_object(*j.m_value.object); - break; - } - - case value_t::discarded: - { - break; - } - - default: - { - JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); - break; - } - } + return static_cast(0xFA); // Single-Precision Float } - - private: - /* - @brief write a number to output input - - @param[in] n number of type @a NumberType - @tparam NumberType the type of the number - @tparam OutputIsLittleEndian Set to true if output data is - required to be little endian - - @note This function needs to respect the system's endianess, because bytes - in CBOR, MessagePack, and UBJSON are stored in network order (big - endian) and therefore need reordering on little endian systems. - */ - template - void write_number(const NumberType n) + static constexpr CharType get_cbor_float_prefix(double /*unused*/) { - // step 1: write number to array of length NumberType - std::array vec; - std::memcpy(vec.data(), &n, sizeof(NumberType)); - - // step 2: write array to output (with possible reordering) - if (is_little_endian and not OutputIsLittleEndian) - { - // reverse byte order prior to conversion if necessary - std::reverse(vec.begin(), vec.end()); - } - - oa->write_characters(vec.data(), sizeof(NumberType)); + return static_cast(0xFB); // Double-Precision Float } + ///////////// + // MsgPack // + ///////////// + + static constexpr CharType get_msgpack_float_prefix(float /*unused*/) + { + return static_cast(0xCA); // float 32 + } + + static constexpr CharType get_msgpack_float_prefix(double /*unused*/) + { + return static_cast(0xCB); // float 64 + } + + //////////// + // UBJSON // + //////////// + // UBJSON: write number (floating point) template::value, int>::type = 0> @@ -9484,26 +9539,6 @@ class binary_writer } } - static constexpr CharType get_cbor_float_prefix(float /*unused*/) - { - return static_cast(0xFA); // Single-Precision Float - } - - static constexpr CharType get_cbor_float_prefix(double /*unused*/) - { - return static_cast(0xFB); // Double-Precision Float - } - - static constexpr CharType get_msgpack_float_prefix(float /*unused*/) - { - return static_cast(0xCA); // float 32 - } - - static constexpr CharType get_msgpack_float_prefix(double /*unused*/) - { - return static_cast(0xCB); // float 64 - } - static constexpr CharType get_ubjson_float_prefix(float /*unused*/) { return 'd'; // float 32 @@ -9514,6 +9549,39 @@ class binary_writer return 'D'; // float 64 } + /////////////////////// + // Utility functions // + /////////////////////// + + /* + @brief write a number to output input + + @param[in] n number of type @a NumberType + @tparam NumberType the type of the number + @tparam OutputIsLittleEndian Set to true if output data is + required to be little endian + + @note This function needs to respect the system's endianess, because bytes + in CBOR, MessagePack, and UBJSON are stored in network order (big + endian) and therefore need reordering on little endian systems. + */ + template + void write_number(const NumberType n) + { + // step 1: write number to array of length NumberType + std::array vec; + std::memcpy(vec.data(), &n, sizeof(NumberType)); + + // step 2: write array to output (with possible reordering) + if (is_little_endian and not OutputIsLittleEndian) + { + // reverse byte order prior to conversion if necessary + std::reverse(vec.begin(), vec.end()); + } + + oa->write_characters(vec.data(), sizeof(NumberType)); + } + private: /// whether we can assume little endianess const bool is_little_endian = binary_reader::little_endianess(); diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index ef94a807..711e8a64 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -48,7 +48,7 @@ TEST_CASE("BSON") SECTION("null") { json j = nullptr; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_AS(json::to_bson(j), json::type_error&); CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is null"); } @@ -57,14 +57,14 @@ TEST_CASE("BSON") SECTION("true") { json j = true; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_AS(json::to_bson(j), json::type_error&); CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is boolean"); } SECTION("false") { json j = false; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_AS(json::to_bson(j), json::type_error&); CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is boolean"); } } @@ -72,29 +72,29 @@ TEST_CASE("BSON") SECTION("number") { json j = 42; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number"); + CHECK_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number"); } SECTION("float") { json j = 4.2; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number"); + CHECK_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is number"); } SECTION("string") { json j = "not supported"; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is string"); + CHECK_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is string"); } SECTION("array") { json j = std::vector {1, 2, 3, 4, 5, 6, 7}; - REQUIRE_THROWS_AS(json::to_bson(j), json::type_error&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is array"); + CHECK_THROWS_AS(json::to_bson(j), json::type_error&); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.type_error.317] to serialize to BSON, top-level type must be object, but is array"); } } @@ -104,7 +104,7 @@ TEST_CASE("BSON") { { std::string("en\0try", 6), true } }; - REQUIRE_THROWS_AS(json::to_bson(j), json::out_of_range&); + CHECK_THROWS_AS(json::to_bson(j), json::out_of_range&); CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.409] BSON key cannot contain code point U+0000 (at byte 2)"); } @@ -541,6 +541,30 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } } + + SECTION("Examples from http://bsonspec.org/faq.html") + { + SECTION("Example 1") + { + std::vector input = {0x16, 0x00, 0x00, 0x00, 0x02, 'h', 'e', 'l', 'l', 'o', 0x00, 0x06, 0x00, 0x00, 0x00, 'w', 'o', 'r', 'l', 'd', 0x00, 0x00}; + json parsed = json::from_bson(input); + json expected = {{"hello", "world"}}; + CHECK(parsed == expected); + auto dumped = json::to_bson(parsed); + CHECK(dumped == input); + } + + SECTION("Example 2") + { + std::vector input = {0x31, 0x00, 0x00, 0x00, 0x04, 'B', 'S', 'O', 'N', 0x00, 0x26, 0x00, 0x00, 0x00, 0x02, 0x30, 0x00, 0x08, 0x00, 0x00, 0x00, 'a', 'w', 'e', 's', 'o', 'm', 'e', 0x00, 0x01, 0x31, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x14, 0x40, 0x10, 0x32, 0x00, 0xc2, 0x07, 0x00, 0x00, 0x00, 0x00}; + json parsed = json::from_bson(input); + json expected = {{"BSON", {"awesome", 5.05, 1986}}}; + CHECK(parsed == expected); + auto dumped = json::to_bson(parsed); + //CHECK(dumped == input); // see https://github.com/nlohmann/json/pull/1254#issuecomment-432831216 + CHECK(json::from_bson(dumped) == expected); + } + } } TEST_CASE("BSON input/output_adapters") @@ -601,10 +625,6 @@ TEST_CASE("BSON input/output_adapters") } } - - - - class SaxCountdown { public: @@ -675,86 +695,84 @@ class SaxCountdown int events_left = 0; }; - -TEST_CASE("Incomplete BSON INPUT") +TEST_CASE("Incomplete BSON Input") { - std::vector incomplete_bson = + SECTION("Incomplete BSON Input 1") { - 0x0D, 0x00, 0x00, 0x00, // size (little endian) - 0x08, // entry: boolean - 'e', 'n', 't' // unexpected EOF - }; + std::vector incomplete_bson = + { + 0x0D, 0x00, 0x00, 0x00, // size (little endian) + 0x08, // entry: boolean + 'e', 'n', 't' // unexpected EOF + }; - CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); - CHECK_THROWS_WITH(json::from_bson(incomplete_bson), - "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing BSON cstring: unexpected end of input"); + CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); + CHECK_THROWS_WITH(json::from_bson(incomplete_bson), + "[json.exception.parse_error.110] parse error at byte 9: syntax error while parsing BSON cstring: unexpected end of input"); - CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); + CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); - SaxCountdown scp(0); - CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); -} + SaxCountdown scp(0); + CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); + } -TEST_CASE("Incomplete BSON INPUT 2") -{ - std::vector incomplete_bson = + SECTION("Incomplete BSON Input 2") { - 0x0D, 0x00, 0x00, 0x00, // size (little endian) - 0x08, // entry: boolean, unexpected EOF - }; + std::vector incomplete_bson = + { + 0x0D, 0x00, 0x00, 0x00, // size (little endian) + 0x08, // entry: boolean, unexpected EOF + }; - CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); - CHECK_THROWS_WITH(json::from_bson(incomplete_bson), - "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing BSON cstring: unexpected end of input"); - CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); + CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); + CHECK_THROWS_WITH(json::from_bson(incomplete_bson), + "[json.exception.parse_error.110] parse error at byte 6: syntax error while parsing BSON cstring: unexpected end of input"); + CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); - SaxCountdown scp(0); - CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); -} + SaxCountdown scp(0); + CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); + } - -TEST_CASE("Incomplete BSON INPUT 3") -{ - std::vector incomplete_bson = + SECTION("Incomplete BSON Input 3") { - 0x41, 0x00, 0x00, 0x00, // size (little endian) - 0x04, /// entry: embedded document - 'e', 'n', 't', 'r', 'y', '\x00', + std::vector incomplete_bson = + { + 0x41, 0x00, 0x00, 0x00, // size (little endian) + 0x04, /// entry: embedded document + 'e', 'n', 't', 'r', 'y', '\x00', - 0x35, 0x00, 0x00, 0x00, // size (little endian) - 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x02, 0x00, 0x00, 0x00 - // missing input data... - }; + 0x35, 0x00, 0x00, 0x00, // size (little endian) + 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x02, 0x00, 0x00, 0x00 + // missing input data... + }; - CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); - CHECK_THROWS_WITH(json::from_bson(incomplete_bson), - "[json.exception.parse_error.110] parse error at byte 28: syntax error while parsing BSON element list: unexpected end of input"); - CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); + CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); + CHECK_THROWS_WITH(json::from_bson(incomplete_bson), + "[json.exception.parse_error.110] parse error at byte 28: syntax error while parsing BSON element list: unexpected end of input"); + CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); - SaxCountdown scp(1); - CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); -} + SaxCountdown scp(1); + CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); + } - - -TEST_CASE("Incomplete BSON INPUT 4") -{ - std::vector incomplete_bson = + SECTION("Incomplete BSON Input 4") { - 0x0D, 0x00, // size (incomplete), unexpected EOF - }; + std::vector incomplete_bson = + { + 0x0D, 0x00, // size (incomplete), unexpected EOF + }; - CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); - CHECK_THROWS_WITH(json::from_bson(incomplete_bson), - "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing BSON number: unexpected end of input"); - CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); + CHECK_THROWS_AS(json::from_bson(incomplete_bson), json::parse_error&); + CHECK_THROWS_WITH(json::from_bson(incomplete_bson), + "[json.exception.parse_error.110] parse error at byte 3: syntax error while parsing BSON number: unexpected end of input"); + CHECK(json::from_bson(incomplete_bson, true, false).is_discarded()); - SaxCountdown scp(0); - CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); + SaxCountdown scp(0); + CHECK(not json::sax_parse(incomplete_bson, &scp, json::input_format_t::bson)); + } } - TEST_CASE("Unsupported BSON input") { std::vector bson = @@ -774,8 +792,6 @@ TEST_CASE("Unsupported BSON input") CHECK(not json::sax_parse(bson, &scp, json::input_format_t::bson)); } - - TEST_CASE("BSON numerical data") { SECTION("number") @@ -1205,12 +1221,12 @@ TEST_CASE("BSON roundtrips", "[hide]") (std::istreambuf_iterator(f_bson)), std::istreambuf_iterator()); - SECTION(filename + ": output adapters: std::vector") - { - std::vector vec; - json::to_bson(j1, vec); - CHECK(vec == packed); - } + SECTION(filename + ": output adapters: std::vector") + { + std::vector vec; + json::to_bson(j1, vec); + CHECK(vec == packed); + } } } } diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index 2c21576d..c7736b71 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -139,10 +139,10 @@ bool operator==(Data const& lhs, Data const& rhs) return lhs.a == rhs.a && lhs.b == rhs.b; } -bool operator!=(Data const& lhs, Data const& rhs) -{ - return !(lhs == rhs); -} +//bool operator!=(Data const& lhs, Data const& rhs) +//{ +// return !(lhs == rhs); +//} } ///////////////////////////////////////////////////////////////////// From 62126278a605f8ec097f2420dfa717d83912cc70 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 25 Oct 2018 13:01:18 +0200 Subject: [PATCH 58/77] :hammer: added fix for arrays --- README.md | 16 +++++++-- .../nlohmann/detail/output/binary_writer.hpp | 7 ++-- single_include/nlohmann/json.hpp | 7 ++-- test/data/json.org/1.json.bson | Bin 393 -> 395 bytes test/data/json.org/2.json.bson | Bin 216 -> 219 bytes test/data/json.org/3.json.bson | Bin 406 -> 406 bytes test/data/json.org/4.json.bson | Bin 2786 -> 2791 bytes test/data/json.org/5.json.bson | Bin 730 -> 764 bytes test/src/unit-bson.cpp | 32 +++++++++++------- 9 files changed, 43 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index eebf86df..0572199f 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ - [JSON Merge Patch](#json-merge-patch) - [Implicit conversions](#implicit-conversions) - [Conversions to/from arbitrary types](#arbitrary-types-conversions) - - [Binary formats (CBOR, MessagePack, and UBJSON)](#binary-formats-cbor-messagepack-and-ubjson) + - [Binary formats (CBOR, BSON, MessagePack, and UBJSON)](#binary-formats-bson-cbor-messagepack-and-ubjson) - [Supported compilers](#supported-compilers) - [License](#license) - [Contact](#contact) @@ -874,14 +874,22 @@ struct bad_serializer }; ``` -### Binary formats (CBOR, MessagePack, and UBJSON) +### Binary formats (CBOR, BSON, MessagePack, and UBJSON -Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports [CBOR](http://cbor.io) (Concise Binary Object Representation), [MessagePack](http://msgpack.org), and [UBJSON](http://ubjson.org) (Universal Binary JSON Specification) to efficiently encode JSON values to byte vectors and to decode such vectors. +Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports [BSON](http://bsonspec.org) (Binary JSON), [CBOR](http://cbor.io) (Concise Binary Object Representation), [MessagePack](http://msgpack.org), and [UBJSON](http://ubjson.org) (Universal Binary JSON Specification) to efficiently encode JSON values to byte vectors and to decode such vectors. ```cpp // create a JSON value json j = R"({"compact": true, "schema": 0})"_json; +// serialize to BSON +std::vector v_bson = json::to_bson(j); + +// 0x1B, 0x00, 0x00, 0x00, 0x08, 0x63, 0x6F, 0x6D, 0x70, 0x61, 0x63, 0x74, 0x00, 0x01, 0x10, 0x73, 0x63, 0x68, 0x65, 0x6D, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + +// roundtrip +json j_from_bson = json::from_bson(v_bson); + // serialize to CBOR std::vector v_cbor = json::to_cbor(j); @@ -1138,6 +1146,8 @@ I deeply appreciate the help of the following people. - [Henry Schreiner](https://github.com/henryiii) added support for GCC 4.8. - [knilch](https://github.com/knilch0r) made sure the test suite does not stall when run in the wrong directory. - [Antonio Borondo](https://github.com/antonioborondo) fixed an MSVC 2017 warning. +- [efp](https://github.com/efp) added line and column information to parse errors. +- [julian-becker](https://github.com/julian-becker) added BSON support. Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone. diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 64a02aac..27833ab6 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -875,10 +875,11 @@ class binary_writer static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value) { std::size_t embedded_document_size = 0ul; + std::size_t array_index = 0ul; for (const auto& el : value) { - embedded_document_size += calc_bson_element_size("", el); + embedded_document_size += calc_bson_element_size(std::to_string(array_index++), el); } return sizeof(std::int32_t) + embedded_document_size + 1ul; @@ -893,9 +894,11 @@ class binary_writer write_bson_entry_header(name, 0x04); // array write_number(static_cast(calc_bson_array_size(value))); + std::size_t array_index = 0ul; + for (const auto& el : value) { - write_bson_element("", el); + write_bson_element(std::to_string(array_index++), el); } oa->write_character(static_cast(0x00)); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index cdd4e680..c9060781 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -9155,10 +9155,11 @@ class binary_writer static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value) { std::size_t embedded_document_size = 0ul; + std::size_t array_index = 0ul; for (const auto& el : value) { - embedded_document_size += calc_bson_element_size("", el); + embedded_document_size += calc_bson_element_size(std::to_string(array_index++), el); } return sizeof(std::int32_t) + embedded_document_size + 1ul; @@ -9173,9 +9174,11 @@ class binary_writer write_bson_entry_header(name, 0x04); // array write_number(static_cast(calc_bson_array_size(value))); + std::size_t array_index = 0ul; + for (const auto& el : value) { - write_bson_element("", el); + write_bson_element(std::to_string(array_index++), el); } oa->write_character(static_cast(0x00)); diff --git a/test/data/json.org/1.json.bson b/test/data/json.org/1.json.bson index e14e9b92304d8a37a803af2e6c870496679aefd6..a2466af8367caa6a96e7881eabd1657453354e81 100644 GIT binary patch delta 196 zcmeBV?q(L~W@KPsPS43NE>0|}WT;`BoXIF>$?OgiaLFuV2n0$qm1LIWq%truFfar& zK%{&!i%S?xKw7~nUGqwSnw1$DCfhK|Pv&Ga6>v;0%FnCJWncwqa`*L_XeZ4BH8nMj zp^;(YyigYwu-@R*RL7j+dWMp7qPS43NE>0|}WT*o1+(A5-%rXXlIL{}uxP-w7&UMWz0V-BxWSDqb z+Lg&MxhOxcGM9msfq@~|-PZ?ZLTVaAJy3`RY+i6`s$))ZK7%Asgo%L#NP<*CSP{NH j6F-GcE?^X!*k(F0QClx3UG;*SV9FPV8K(#6# diff --git a/test/data/json.org/2.json.bson b/test/data/json.org/2.json.bson index 0f4356e16daadc3fd1e5d602ac5b01a9637b0747..743822c57eda0cce5a56fc1a738786be582d0016 100644 GIT binary patch literal 219 zcmcc3z`($qo0?b3Z~@3-%1mKk1=4AmIjIaxWr;bZsbIbvh|gS*Ur<`WupB7Q0@9IL zlA6mf1Ek-8!2qNgqMilF^h+&gV9L)+&dE&9X5a@3I2WZRmZSoOUGkGPG=W+S8FUa@ pKvwz}q~;;?a6v_2%8eNG5X#wrOy`{ZVxSXYc5uUlpc;T&1^{E^FsuLo literal 216 zcmcb?z`($qo0?b3a2Cj7%1mKk1=4AmIjIcH1^ES~1q@4od=`+3%#zexhN&R+3Qmu!qnj6S*&dD!MMN!TM69v*R`#?sxft=33008zvFbx0z diff --git a/test/data/json.org/3.json.bson b/test/data/json.org/3.json.bson index deb7c5391fc76590baf686212ee5a4407c404dc6..2c43e3518d29c74c0d79c3b3d32e04655251c97e 100644 GIT binary patch literal 406 zcmZ`!u};G<5Ir0L14v|N@xTBb+H^#Si3NmEhYG=fgq--|SU7eRUnu1d_yPWczhh$J zOgm5sw)gJ6d++Xj3m{uqZIIxNvCvo!1~LE$J}F*@1>7?gWXT~MGMuZnb11KauT?oX zMWL5>s|?{)i?Gk8R$2eJ-p{##8u;Xbyg_Rk`oWOdRvCnc6d(Hv4j5deQJl;NKkmGN zRp2%Yaqv@KpVf8bW50NkKmQ^^Ict22o?w@?iUIcg9N`PW2Tz1nq+pNHg|pR@yu=6l0*h>pbqDp%;anZkJO@6 z1}rwP0abu>8BUI5w3@^yr3yDO1t`P7T%MVil3&gc0b~ngq-LgPlrVf@WSHnLK2b}J OPoO+Ar6dC+00IE2Z#VV; diff --git a/test/data/json.org/4.json.bson b/test/data/json.org/4.json.bson index 31812125a1c55004e0cc4ca87c8e67ce553d59ba..aceba2d8ab6f741a77fac37908bc4fabf4612ce9 100644 GIT binary patch delta 570 zcmY*WJ#Q015S_cd5Bo%jm0%o2QBXdlASY)#9|$C*fJt0{ECIGDNQ2h7_2uw=akmbp zfiC@O3OYbYRQv`CC}p}Jdfbj_LIaqT_>R)RO~uCN$`F6*7w|y8ieL2^ ze6LU9MXijMwlbC*r0hof7Jzy`jd4?(CE0mTD+_-?++7rni9&}3u}?WmI|<$GgCl+~ zi|-TSuqfV4i`S*GZ7<=ET8ug%{o%acz(3kLy85~CZ1^_iw9TW0fr4k%WqhmE@I0Bv zJ@pd4B0aoD0(_^g;tO>O3#5c~b;)iQ3N=?NM+*)-w{+QId8@0|uug((`;a zs=|R;kz+QXrk)6NqR3D2Wq#wols_ndPx1@+EZ4$c<_?nlV{GMao{sw0!>uUfY{)^D zd@|=sncshkf!wASx^R%?WnIRCbp{_;(^u5ps7Hs#QXtn0Ri3F<%d(YI*Y~>6%#5Gh V?Lp#YiNkSIh5HUZwJJmce*tQkrPu%f delta 519 zcmY+A&ubGw9K~m6H?uz|ZD?5xLL(`Owv|n_1gaELf5d~LRGNxNy^PIR*X)n5JKDs9 zh-X2=I|zc{e-Qryz4o98T0{^py+{#nq8^=X+JlGr@#gX6z4?51cij0MhY)>J-12y* zL$;MLQjy#bgd|^W<&ZX0yC3<|>+pn!WP;%bt>6niiY+=mx*^hrpUB>d;4R|dpj(WmU8ZV}QS)ca3r{hwW2H)c_1$MDHGg)vsZc5V@CtmwA5DVBJea;~Qs3A)yk=FrHxG?m2)Q3*hMLBJO^uvwg?`i=vcx;HfV#=pzW>~;;(=Lo zl{`WJ=lem!XS;+~)*5>DGFGhRu^^7y7bC?&imoIY{#cJuwMy7EYbtsYf9=Wfy|lfO lb36;4o5iTJm|uPr|Jqo{MvFQ^1+HZ+;Ml2M<@&~)+*Mr|fTv&qa%K+1fw9+M%Hp~d8Q cCQTVbO9o~m0~F03sW}Be%|?ck=P}s;0KuUt)&Kwi delta 205 zcmeyvdW)6&783&lb8c#0DZ}}R+=`NGKwJhP1_lPE%oGMzAnjj}ng zF3_HM#?%F expected = { - 0x41, 0x00, 0x00, 0x00, // size (little endian) + 0x49, 0x00, 0x00, 0x00, // size (little endian) 0x04, /// entry: embedded document 'e', 'n', 't', 'r', 'y', '\x00', - 0x35, 0x00, 0x00, 0x00, // size (little endian) - 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x3D, 0x00, 0x00, 0x00, // size (little endian) + 0x10, '0', 0x00, 0x01, 0x00, 0x00, 0x00, + 0x10, '1', 0x00, 0x02, 0x00, 0x00, 0x00, + 0x10, '2', 0x00, 0x03, 0x00, 0x00, 0x00, + 0x10, '3', 0x00, 0x04, 0x00, 0x00, 0x00, + 0x10, '4', 0x00, 0x05, 0x00, 0x00, 0x00, + 0x10, '5', 0x00, 0x06, 0x00, 0x00, 0x00, + 0x10, '6', 0x00, 0x07, 0x00, 0x00, 0x00, + 0x10, '7', 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, // end marker (embedded document) 0x00 // end marker @@ -552,6 +552,7 @@ TEST_CASE("BSON") CHECK(parsed == expected); auto dumped = json::to_bson(parsed); CHECK(dumped == input); + CHECK(json::from_bson(dumped) == expected); } SECTION("Example 2") @@ -561,7 +562,7 @@ TEST_CASE("BSON") json expected = {{"BSON", {"awesome", 5.05, 1986}}}; CHECK(parsed == expected); auto dumped = json::to_bson(parsed); - //CHECK(dumped == input); // see https://github.com/nlohmann/json/pull/1254#issuecomment-432831216 + CHECK(dumped == input); CHECK(json::from_bson(dumped) == expected); } } @@ -1225,7 +1226,14 @@ TEST_CASE("BSON roundtrips", "[hide]") { std::vector vec; json::to_bson(j1, vec); - CHECK(vec == packed); + + if (vec != packed) + { + // the exact serializations may differ due to the order of + // object keys; in these cases, just compare whether both + // serializations create the same JSON value + CHECK(json::from_bson(vec) == json::from_bson(packed)); + } } } } From 19647e083c0fb6889a0dcd1cf459bc99d46a4ab0 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 25 Oct 2018 14:27:55 +0200 Subject: [PATCH 59/77] :rotating_light: fixed compiler warnings --- include/nlohmann/detail/input/binary_reader.hpp | 4 ++-- include/nlohmann/detail/output/serializer.hpp | 1 + single_include/nlohmann/json.hpp | 5 +++-- test/src/fuzzer-parse_json.cpp | 4 ---- test/src/unit-bson.cpp | 6 +++--- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 615ab73c..7d278736 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -246,13 +246,13 @@ class binary_reader case 0x10: // int32 { std::int32_t value; - return get_number(input_format_t::bson, value) and sax->number_integer(static_cast(value)); + return get_number(input_format_t::bson, value) and sax->number_integer(value); } case 0x12: // int64 { std::int64_t value; - return get_number(input_format_t::bson, value) and sax->number_integer(static_cast(value)); + return get_number(input_format_t::bson, value) and sax->number_integer(value); } default: // anything else not supported (yet) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 1d107ce0..8c48e36e 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -463,6 +463,7 @@ class serializer continue; } } + break; } default: // decode found yet incomplete multi-byte code point diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index c9060781..9bb67ff1 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6547,13 +6547,13 @@ class binary_reader case 0x10: // int32 { std::int32_t value; - return get_number(input_format_t::bson, value) and sax->number_integer(static_cast(value)); + return get_number(input_format_t::bson, value) and sax->number_integer(value); } case 0x12: // int64 { std::int64_t value; - return get_number(input_format_t::bson, value) and sax->number_integer(static_cast(value)); + return get_number(input_format_t::bson, value) and sax->number_integer(value); } default: // anything else not supported (yet) @@ -11161,6 +11161,7 @@ class serializer continue; } } + break; } default: // decode found yet incomplete multi-byte code point diff --git a/test/src/fuzzer-parse_json.cpp b/test/src/fuzzer-parse_json.cpp index ed586385..7aa3dc21 100644 --- a/test/src/fuzzer-parse_json.cpp +++ b/test/src/fuzzer-parse_json.cpp @@ -60,10 +60,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) // parse errors are ok, because input may be random bytes } catch (const json::out_of_range&) - { - // parse errors are ok, because input may be random bytes - } - catch (const json::out_of_range&) { // out of range errors may happen if provided sizes are excessive } diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 5a16aefd..aeb7b898 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -1013,7 +1013,7 @@ TEST_CASE("BSON numerical data") { "entry", i } }; - std::uint64_t iu = *reinterpret_cast(&i); + auto iu = i; std::vector expected_bson = { 0x10u, 0x00u, 0x00u, 0x00u, // size (little endian) @@ -1068,7 +1068,7 @@ TEST_CASE("BSON numerical data") { "entry", i } }; - std::uint64_t iu = *reinterpret_cast(&i); + auto iu = i; std::vector expected_bson = { 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) @@ -1118,7 +1118,7 @@ TEST_CASE("BSON numerical data") { "entry", i } }; - std::uint64_t iu = *reinterpret_cast(&i); + auto iu = i; std::vector expected_bson = { 0x14u, 0x00u, 0x00u, 0x00u, // size (little endian) From 7ce720b7006727ee2ca948fa55be81f91dff4191 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 25 Oct 2018 18:21:50 +0200 Subject: [PATCH 60/77] :rotating_light: fixed coverage --- include/nlohmann/detail/output/serializer.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 8c48e36e..090f22b1 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -463,7 +463,7 @@ class serializer continue; } } - break; + break; // LCOV_EXCL_LINE } default: // decode found yet incomplete multi-byte code point diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 9bb67ff1..c2295399 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -11161,7 +11161,7 @@ class serializer continue; } } - break; + break; // LCOV_EXCL_LINE } default: // decode found yet incomplete multi-byte code point From d97fa30795f83e57a3b1c62505248fec9f29a7f1 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 25 Oct 2018 22:29:27 +0200 Subject: [PATCH 61/77] :ok_hand: fixed comment #1320 --- test/src/fuzzer-parse_bson.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/fuzzer-parse_bson.cpp b/test/src/fuzzer-parse_bson.cpp index 1d933767..86b9f176 100644 --- a/test/src/fuzzer-parse_bson.cpp +++ b/test/src/fuzzer-parse_bson.cpp @@ -51,7 +51,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) } catch (const json::parse_error&) { - // parsing a CBOR serialization must not fail + // parsing a BSON serialization must not fail assert(false); } } From c2e175763c7fb4137fc0b8ce6c07fc5e5a9928df Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Thu, 25 Oct 2018 22:47:08 +0200 Subject: [PATCH 62/77] :ok_hand: added another conversion function #1315 --- include/nlohmann/detail/output/binary_writer.hpp | 11 +++++++++++ single_include/nlohmann/json.hpp | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 133b60f8..4e969158 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -965,6 +965,17 @@ class binary_writer return x; } + template < typename InputCharType, typename C = CharType, + enable_if_t < + std::is_signed::value and + std::is_signed::value and + std::is_same::type>::value + > * = nullptr > + static constexpr CharType to_char_type(InputCharType x) noexcept + { + return x; + } + private: /// whether we can assume little endianess const bool is_little_endian = binary_reader::little_endianess(); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 2fd5144e..d11c07d9 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -9010,6 +9010,17 @@ class binary_writer return x; } + template < typename InputCharType, typename C = CharType, + enable_if_t < + std::is_signed::value and + std::is_signed::value and + std::is_same::type>::value + > * = nullptr > + static constexpr CharType to_char_type(InputCharType x) noexcept + { + return x; + } + private: /// whether we can assume little endianess const bool is_little_endian = binary_reader::little_endianess(); From 544150d5a54058f91dbda330087cc93844ecd6aa Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Fri, 26 Oct 2018 11:10:49 +0200 Subject: [PATCH 63/77] :rotating_light: fixed another linter warning --- include/nlohmann/detail/output/serializer.hpp | 4 ++-- single_include/nlohmann/json.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 090f22b1..41f248a2 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -460,10 +460,10 @@ class serializer // continue processing the string state = UTF8_ACCEPT; - continue; + break; } } - break; // LCOV_EXCL_LINE + break; } default: // decode found yet incomplete multi-byte code point diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index c2295399..9b2636ad 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -11158,10 +11158,10 @@ class serializer // continue processing the string state = UTF8_ACCEPT; - continue; + break; } } - break; // LCOV_EXCL_LINE + break; } default: // decode found yet incomplete multi-byte code point From ad639ad5e6f0fef6ad358a7f35f5793b0baabeed Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Fri, 26 Oct 2018 14:48:20 +0200 Subject: [PATCH 64/77] :sparkles: added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208 --- README.md | 52 +++++++++++++++++++ include/nlohmann/detail/macro_scope.hpp | 31 ++++++++++++ single_include/nlohmann/json.hpp | 31 ++++++++++++ test/src/unit-conversions.cpp | 66 +++++++++++++++++++++++++ 4 files changed, 180 insertions(+) diff --git a/README.md b/README.md index eebf86df..a64dab8d 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ - [JSON Merge Patch](#json-merge-patch) - [Implicit conversions](#implicit-conversions) - [Conversions to/from arbitrary types](#arbitrary-types-conversions) + - [Specializing enum conversion](#specializing-enum-conversion) - [Binary formats (CBOR, MessagePack, and UBJSON)](#binary-formats-cbor-messagepack-and-ubjson) - [Supported compilers](#supported-compilers) - [License](#license) @@ -874,6 +875,56 @@ struct bad_serializer }; ``` +### Specializing enum conversion + +By default, enum values are serialized to JSON as integers. In some cases this could result in undesired behavior. If an enum is modified or re-ordered after data has been serialized to JSON, the later de-serialized JSON data may be undefined or a different enum value than was originally intended. + +It is possible to more precisely specify how a given enum is mapped to and from JSON as shown below: + +```cpp +// example enum type declaration +enum TaskState { + TS_STOPPED, + TS_RUNNING, + TS_COMPLETED, + TS_INVALID=-1, +}; + +// map TaskState values to JSON as strings +NLOHMANN_JSON_SERIALIZE_ENUM( TaskState, { + {TS_INVALID, nullptr}, + {TS_STOPPED, "stopped"}, + {TS_RUNNING, "running"}, + {TS_COMPLETED, "completed"}, +}); +``` + +The `NLOHMANN_JSON_SERIALIZE_ENUM()` macro declares a set of `to_json()` / `from_json()` functions for type `TaskState` while avoiding repetition and boilerplate serilization code. + +**Usage:** + +```cpp +// enum to JSON as string +json j = TS_STOPPED; +assert(j == "stopped"); + +// json string to enum +json j3 = "running"; +assert(j3.get() == TS_RUNNING); + +// undefined json value to enum (where the first map entry above is the default) +json jPi = 3.14; +assert(jPi.get() == TS_INVALID ); +``` + +Just as in [Arbitrary Type Conversions](#arbitrary-types-conversions) above, +- `NLOHMANN_JSON_SERIALIZE_ENUM()` MUST be declared in your enum type's namespace (which can be the global namespace), or the library will not be able to locate it and it will default to integer serialization. +- It MUST be available (e.g., proper headers must be included) everywhere you use the conversions. + +Other Important points: +- When using `get()`, undefined JSON values will default to the first pair specified in your map. Select this default pair carefully. +- If an enum or JSON value is specified more than once in your map, the first matching occurrence from the top of the map will be returned when converting to or from JSON. + ### Binary formats (CBOR, MessagePack, and UBJSON) Though JSON is a ubiquitous data format, it is not a very compact format suitable for data exchange, for instance over a network. Hence, the library supports [CBOR](http://cbor.io) (Concise Binary Object Representation), [MessagePack](http://msgpack.org), and [UBJSON](http://ubjson.org) (Universal Binary JSON Specification) to efficiently encode JSON values to byte vectors and to decode such vectors. @@ -1138,6 +1189,7 @@ I deeply appreciate the help of the following people. - [Henry Schreiner](https://github.com/henryiii) added support for GCC 4.8. - [knilch](https://github.com/knilch0r) made sure the test suite does not stall when run in the wrong directory. - [Antonio Borondo](https://github.com/antonioborondo) fixed an MSVC 2017 warning. +- [Dan Gendreau](https://github.com/dgendreau) implemented the `NLOHMANN_JSON_SERIALIZE_ENUM` macro to quickly define a enum/JSON mapping. Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone. diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp index 06805b1a..1f0f9bd5 100644 --- a/include/nlohmann/detail/macro_scope.hpp +++ b/include/nlohmann/detail/macro_scope.hpp @@ -87,6 +87,37 @@ #define JSON_HAS_CPP_14 #endif +/*! +@brief macro to briefly define a mapping between an enum and JSON +@macro NLOHMANN_JSON_SERIALIZE_ENUM +@since version 3.4.0 +*/ +#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ + template \ + inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::vector> m = __VA_ARGS__; \ + auto it = std::find_if(m.cbegin(), m.cend(), \ + [e](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.first == e; \ + }); \ + j = ((it != m.cend()) ? it : m.cbegin())->second; \ + } \ + template \ + inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::vector> m = __VA_ARGS__; \ + auto it = std::find_if(m.cbegin(), m.cend(), \ + [j](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.second == j; \ + }); \ + e = ((it != m.cend()) ? it : m.cbegin())->first; \ + } + // Ugly macros to avoid uglier copy-paste when specializing basic_json. They // may be removed in the future once the class is split. diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index b132e850..77f9e072 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -202,6 +202,37 @@ using json = basic_json<>; #define JSON_HAS_CPP_14 #endif +/*! +@brief macro to briefly define a mapping between an enum and JSON +@macro NLOHMANN_JSON_SERIALIZE_ENUM +@since version 3.4.0 +*/ +#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ + template \ + inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::vector> m = __VA_ARGS__; \ + auto it = std::find_if(m.cbegin(), m.cend(), \ + [e](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.first == e; \ + }); \ + j = ((it != m.cend()) ? it : m.cbegin())->second; \ + } \ + template \ + inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::vector> m = __VA_ARGS__; \ + auto it = std::find_if(m.cbegin(), m.cend(), \ + [j](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.second == j; \ + }); \ + e = ((it != m.cend()) ? it : m.cbegin())->first; \ + } + // Ugly macros to avoid uglier copy-paste when specializing basic_json. They // may be removed in the future once the class is split. diff --git a/test/src/unit-conversions.cpp b/test/src/unit-conversions.cpp index 8df21f3f..266282e9 100644 --- a/test/src/unit-conversions.cpp +++ b/test/src/unit-conversions.cpp @@ -1368,3 +1368,69 @@ TEST_CASE("value conversion") } } } + +enum class cards {kreuz, pik, herz, karo}; + +NLOHMANN_JSON_SERIALIZE_ENUM(cards, +{ + {cards::kreuz, "kreuz"}, + {cards::pik, "pik"}, + {cards::pik, "puk"}, // second entry for cards::puk; will not be used + {cards::herz, "herz"}, + {cards::karo, "karo"} +}); + +enum TaskState +{ + TS_STOPPED, + TS_RUNNING, + TS_COMPLETED, + TS_INVALID = -1, +}; + +NLOHMANN_JSON_SERIALIZE_ENUM(TaskState, +{ + {TS_INVALID, nullptr}, + {TS_STOPPED, "stopped"}, + {TS_RUNNING, "running"}, + {TS_COMPLETED, "completed"}, +}); + +TEST_CASE("JSON to enum mapping") +{ + SECTION("enum class") + { + // enum -> json + CHECK(json(cards::kreuz) == "kreuz"); + CHECK(json(cards::pik) == "pik"); + CHECK(json(cards::herz) == "herz"); + CHECK(json(cards::karo) == "karo"); + + // json -> enum + CHECK(cards::kreuz == json("kreuz")); + CHECK(cards::pik == json("pik")); + CHECK(cards::herz == json("herz")); + CHECK(cards::karo == json("karo")); + + // invalid json -> first enum + CHECK(cards::kreuz == json("what?").get()); + } + + SECTION("traditional enum") + { + // enum -> json + CHECK(json(TS_STOPPED) == "stopped"); + CHECK(json(TS_RUNNING) == "running"); + CHECK(json(TS_COMPLETED) == "completed"); + CHECK(json(TS_INVALID) == json()); + + // json -> enum + CHECK(TS_STOPPED == json("stopped")); + CHECK(TS_RUNNING == json("running")); + CHECK(TS_COMPLETED == json("completed")); + CHECK(TS_INVALID == json()); + + // invalid json -> first enum + CHECK(TS_INVALID == json("what?").get()); + } +} From 6384fe28db241e1a112d7da1f8d4b8fdc5c60346 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Fri, 26 Oct 2018 23:12:41 +0200 Subject: [PATCH 65/77] :rotating_light: fixed another linter warning --- include/nlohmann/detail/output/binary_writer.hpp | 1 - single_include/nlohmann/json.hpp | 1 - 2 files changed, 2 deletions(-) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 27833ab6..7c0e6939 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -56,7 +56,6 @@ class binary_writer default: { JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); - break; } } } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 9b2636ad..79f74e4c 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -8336,7 +8336,6 @@ class binary_writer default: { JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); - break; } } } From 9f48bb69372d59614327e485960fc0d30edf39cb Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 27 Oct 2018 09:58:23 +0200 Subject: [PATCH 66/77] :zap: replaced vector by array #1323 --- include/nlohmann/detail/macro_scope.hpp | 12 ++++++------ single_include/nlohmann/json.hpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp index 1f0f9bd5..5e42a0e8 100644 --- a/include/nlohmann/detail/macro_scope.hpp +++ b/include/nlohmann/detail/macro_scope.hpp @@ -97,25 +97,25 @@ inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ { \ static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::vector> m = __VA_ARGS__; \ - auto it = std::find_if(m.cbegin(), m.cend(), \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ [e](const std::pair& ej_pair) -> bool \ { \ return ej_pair.first == e; \ }); \ - j = ((it != m.cend()) ? it : m.cbegin())->second; \ + j = ((it != std::end(m)) ? it : std::begin(m))->second; \ } \ template \ inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ { \ static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::vector> m = __VA_ARGS__; \ - auto it = std::find_if(m.cbegin(), m.cend(), \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ [j](const std::pair& ej_pair) -> bool \ { \ return ej_pair.second == j; \ }); \ - e = ((it != m.cend()) ? it : m.cbegin())->first; \ + e = ((it != std::end(m)) ? it : std::begin(m))->first; \ } // Ugly macros to avoid uglier copy-paste when specializing basic_json. They diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 77f9e072..1268ca1d 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -212,25 +212,25 @@ using json = basic_json<>; inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ { \ static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::vector> m = __VA_ARGS__; \ - auto it = std::find_if(m.cbegin(), m.cend(), \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ [e](const std::pair& ej_pair) -> bool \ { \ return ej_pair.first == e; \ }); \ - j = ((it != m.cend()) ? it : m.cbegin())->second; \ + j = ((it != std::end(m)) ? it : std::begin(m))->second; \ } \ template \ inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ { \ static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ - static const std::vector> m = __VA_ARGS__; \ - auto it = std::find_if(m.cbegin(), m.cend(), \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ [j](const std::pair& ej_pair) -> bool \ { \ return ej_pair.second == j; \ }); \ - e = ((it != m.cend()) ? it : m.cbegin())->first; \ + e = ((it != std::end(m)) ? it : std::begin(m))->first; \ } // Ugly macros to avoid uglier copy-paste when specializing basic_json. They From 4e765596f7656fa4687b442e9f6d420f6a901a3c Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 27 Oct 2018 18:31:03 +0200 Subject: [PATCH 67/77] :hammer: small improvements --- .../nlohmann/detail/input/binary_reader.hpp | 16 +- .../nlohmann/detail/input/input_adapters.hpp | 6 +- .../nlohmann/detail/output/binary_writer.hpp | 272 +++++++++------- .../detail/output/output_adapters.hpp | 12 +- single_include/nlohmann/json.hpp | 306 ++++++++++-------- test/src/unit-bson.cpp | 36 +-- 6 files changed, 339 insertions(+), 309 deletions(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 7d278736..ed2d66fd 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -68,6 +68,10 @@ class binary_reader switch (format) { + case input_format_t::bson: + result = parse_bson_internal(); + break; + case input_format_t::cbor: result = parse_cbor_internal(); break; @@ -80,10 +84,6 @@ class binary_reader result = parse_ubjson_internal(); break; - case input_format_t::bson: - result = parse_bson_internal(); - break; - // LCOV_EXCL_START default: assert(false); @@ -135,8 +135,8 @@ class binary_reader */ bool parse_bson_internal() { - std::int32_t documentSize; - get_number(input_format_t::bson, documentSize); + std::int32_t document_size; + get_number(input_format_t::bson, document_size); if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1)))) { @@ -315,8 +315,8 @@ class binary_reader */ bool parse_bson_array() { - std::int32_t documentSize; - get_number(input_format_t::bson, documentSize); + std::int32_t document_size; + get_number(input_format_t::bson, document_size); if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1)))) { diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp index 8b7852b8..79a19c17 100644 --- a/include/nlohmann/detail/input/input_adapters.hpp +++ b/include/nlohmann/detail/input/input_adapters.hpp @@ -92,7 +92,7 @@ class input_stream_adapter : public input_adapter_protocol class input_buffer_adapter : public input_adapter_protocol { public: - input_buffer_adapter(const char* b, const std::size_t l) + input_buffer_adapter(const char* b, const std::size_t l) noexcept : cursor(b), limit(b + l) {} @@ -240,7 +240,9 @@ template class wide_string_input_adapter : public input_adapter_protocol { public: - explicit wide_string_input_adapter(const WideStringType& w) : str(w) {} + explicit wide_string_input_adapter(const WideStringType& w) noexcept + : str(w) + {} std::char_traits::int_type get_character() noexcept override { diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 7c0e6939..f54e2485 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -23,6 +23,8 @@ namespace detail template class binary_writer { + using string_t = typename BasicJsonType::string_t; + public: /*! @brief create a binary writer @@ -48,11 +50,6 @@ class binary_writer break; } - case value_t::discarded: - { - break; - } - default: { JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); @@ -69,15 +66,15 @@ class binary_writer { case value_t::null: { - oa->write_character(static_cast(0xF6)); + oa->write_character(to_char_type(0xF6)); break; } case value_t::boolean: { oa->write_character(j.m_value.boolean - ? static_cast(0xF5) - : static_cast(0xF4)); + ? to_char_type(0xF5) + : to_char_type(0xF4)); break; } @@ -94,22 +91,22 @@ class binary_writer } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x18)); + oa->write_character(to_char_type(0x18)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x19)); + oa->write_character(to_char_type(0x19)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x1A)); + oa->write_character(to_char_type(0x1A)); write_number(static_cast(j.m_value.number_integer)); } else { - oa->write_character(static_cast(0x1B)); + oa->write_character(to_char_type(0x1B)); write_number(static_cast(j.m_value.number_integer)); } } @@ -124,22 +121,22 @@ class binary_writer } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x38)); + oa->write_character(to_char_type(0x38)); write_number(static_cast(positive_number)); } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x39)); + oa->write_character(to_char_type(0x39)); write_number(static_cast(positive_number)); } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x3A)); + oa->write_character(to_char_type(0x3A)); write_number(static_cast(positive_number)); } else { - oa->write_character(static_cast(0x3B)); + oa->write_character(to_char_type(0x3B)); write_number(static_cast(positive_number)); } } @@ -154,22 +151,22 @@ class binary_writer } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x18)); + oa->write_character(to_char_type(0x18)); write_number(static_cast(j.m_value.number_unsigned)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x19)); + oa->write_character(to_char_type(0x19)); write_number(static_cast(j.m_value.number_unsigned)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x1A)); + oa->write_character(to_char_type(0x1A)); write_number(static_cast(j.m_value.number_unsigned)); } else { - oa->write_character(static_cast(0x1B)); + oa->write_character(to_char_type(0x1B)); write_number(static_cast(j.m_value.number_unsigned)); } break; @@ -192,23 +189,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x78)); + oa->write_character(to_char_type(0x78)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x79)); + oa->write_character(to_char_type(0x79)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x7A)); + oa->write_character(to_char_type(0x7A)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x7B)); + oa->write_character(to_char_type(0x7B)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -230,23 +227,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x98)); + oa->write_character(to_char_type(0x98)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x99)); + oa->write_character(to_char_type(0x99)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x9A)); + oa->write_character(to_char_type(0x9A)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x9B)); + oa->write_character(to_char_type(0x9B)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -269,23 +266,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xB8)); + oa->write_character(to_char_type(0xB8)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xB9)); + oa->write_character(to_char_type(0xB9)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xBA)); + oa->write_character(to_char_type(0xBA)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xBB)); + oa->write_character(to_char_type(0xBB)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -313,15 +310,15 @@ class binary_writer { case value_t::null: // nil { - oa->write_character(static_cast(0xC0)); + oa->write_character(to_char_type(0xC0)); break; } case value_t::boolean: // true and false { oa->write_character(j.m_value.boolean - ? static_cast(0xC3) - : static_cast(0xC2)); + ? to_char_type(0xC3) + : to_char_type(0xC2)); break; } @@ -340,25 +337,25 @@ class binary_writer else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 8 - oa->write_character(static_cast(0xCC)); + oa->write_character(to_char_type(0xCC)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 16 - oa->write_character(static_cast(0xCD)); + oa->write_character(to_char_type(0xCD)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 32 - oa->write_character(static_cast(0xCE)); + oa->write_character(to_char_type(0xCE)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 64 - oa->write_character(static_cast(0xCF)); + oa->write_character(to_char_type(0xCF)); write_number(static_cast(j.m_value.number_integer)); } } @@ -373,28 +370,28 @@ class binary_writer j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 8 - oa->write_character(static_cast(0xD0)); + oa->write_character(to_char_type(0xD0)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 16 - oa->write_character(static_cast(0xD1)); + oa->write_character(to_char_type(0xD1)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 32 - oa->write_character(static_cast(0xD2)); + oa->write_character(to_char_type(0xD2)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 64 - oa->write_character(static_cast(0xD3)); + oa->write_character(to_char_type(0xD3)); write_number(static_cast(j.m_value.number_integer)); } } @@ -411,25 +408,25 @@ class binary_writer else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 8 - oa->write_character(static_cast(0xCC)); + oa->write_character(to_char_type(0xCC)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 16 - oa->write_character(static_cast(0xCD)); + oa->write_character(to_char_type(0xCD)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 32 - oa->write_character(static_cast(0xCE)); + oa->write_character(to_char_type(0xCE)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 64 - oa->write_character(static_cast(0xCF)); + oa->write_character(to_char_type(0xCF)); write_number(static_cast(j.m_value.number_integer)); } break; @@ -454,19 +451,19 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // str 8 - oa->write_character(static_cast(0xD9)); + oa->write_character(to_char_type(0xD9)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // str 16 - oa->write_character(static_cast(0xDA)); + oa->write_character(to_char_type(0xDA)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // str 32 - oa->write_character(static_cast(0xDB)); + oa->write_character(to_char_type(0xDB)); write_number(static_cast(N)); } @@ -489,13 +486,13 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // array 16 - oa->write_character(static_cast(0xDC)); + oa->write_character(to_char_type(0xDC)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // array 32 - oa->write_character(static_cast(0xDD)); + oa->write_character(to_char_type(0xDD)); write_number(static_cast(N)); } @@ -519,13 +516,13 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // map 16 - oa->write_character(static_cast(0xDE)); + oa->write_character(to_char_type(0xDE)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // map 32 - oa->write_character(static_cast(0xDF)); + oa->write_character(to_char_type(0xDF)); write_number(static_cast(N)); } @@ -558,7 +555,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('Z')); + oa->write_character(to_char_type('Z')); } break; } @@ -568,8 +565,8 @@ class binary_writer if (add_prefix) { oa->write_character(j.m_value.boolean - ? static_cast('T') - : static_cast('F')); + ? to_char_type('T') + : to_char_type('F')); } break; } @@ -596,7 +593,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('S')); + oa->write_character(to_char_type('S')); } write_number_with_ubjson_prefix(j.m_value.string->size(), true); oa->write_characters( @@ -609,7 +606,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('[')); + oa->write_character(to_char_type('[')); } bool prefix_required = true; @@ -626,14 +623,14 @@ class binary_writer if (same_prefix) { prefix_required = false; - oa->write_character(static_cast('$')); + oa->write_character(to_char_type('$')); oa->write_character(first_prefix); } } if (use_count) { - oa->write_character(static_cast('#')); + oa->write_character(to_char_type('#')); write_number_with_ubjson_prefix(j.m_value.array->size(), true); } @@ -644,7 +641,7 @@ class binary_writer if (not use_count) { - oa->write_character(static_cast(']')); + oa->write_character(to_char_type(']')); } break; @@ -654,7 +651,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('{')); + oa->write_character(to_char_type('{')); } bool prefix_required = true; @@ -671,14 +668,14 @@ class binary_writer if (same_prefix) { prefix_required = false; - oa->write_character(static_cast('$')); + oa->write_character(to_char_type('$')); oa->write_character(first_prefix); } } if (use_count) { - oa->write_character(static_cast('#')); + oa->write_character(to_char_type('#')); write_number_with_ubjson_prefix(j.m_value.object->size(), true); } @@ -693,7 +690,7 @@ class binary_writer if (not use_count) { - oa->write_character(static_cast('}')); + oa->write_character(to_char_type('}')); } break; @@ -713,9 +710,9 @@ class binary_writer @return The size of a BSON document entry header, including the id marker and the entry name size (and its null-terminator). */ - static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) + static std::size_t calc_bson_entry_header_size(const string_t& name) { - const auto it = name.find(static_cast(0)); + const auto it = name.find(static_cast(0)); if (JSON_UNLIKELY(it != BasicJsonType::string_t::npos)) { JSON_THROW(out_of_range::create(409, @@ -728,10 +725,10 @@ class binary_writer /*! @brief Writes the given @a element_type and @a name to the output adapter */ - void write_bson_entry_header(const typename BasicJsonType::string_t& name, - std::uint8_t element_type) + void write_bson_entry_header(const string_t& name, + const std::uint8_t element_type) { - oa->write_character(static_cast(element_type)); // boolean + oa->write_character(to_char_type(element_type)); // boolean oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); @@ -740,17 +737,17 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and boolean value @a value */ - void write_bson_boolean(const typename BasicJsonType::string_t& name, + void write_bson_boolean(const string_t& name, const bool value) { write_bson_entry_header(name, 0x08); - oa->write_character(value ? static_cast(0x01) : static_cast(0x00)); + oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00)); } /*! @brief Writes a BSON element with key @a name and double value @a value */ - void write_bson_double(const typename BasicJsonType::string_t& name, + void write_bson_double(const string_t& name, const double value) { write_bson_entry_header(name, 0x01); @@ -760,7 +757,7 @@ class binary_writer /*! @return The size of the BSON-encoded string in @a value */ - static std::size_t calc_bson_string_size(const typename BasicJsonType::string_t& value) + static std::size_t calc_bson_string_size(const string_t& value) { return sizeof(std::int32_t) + value.size() + 1ul; } @@ -768,8 +765,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and string value @a value */ - void write_bson_string(const typename BasicJsonType::string_t& name, - const typename BasicJsonType::string_t& value) + void write_bson_string(const string_t& name, + const string_t& value) { write_bson_entry_header(name, 0x02); @@ -782,7 +779,7 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and null value */ - void write_bson_null(const typename BasicJsonType::string_t& name) + void write_bson_null(const string_t& name) { write_bson_entry_header(name, 0x0A); } @@ -805,7 +802,7 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and integer @a value */ - void write_bson_integer(const typename BasicJsonType::string_t& name, + void write_bson_integer(const string_t& name, const std::int64_t value) { if ((std::numeric_limits::min)() <= value and value <= (std::numeric_limits::max)()) @@ -823,45 +820,39 @@ class binary_writer /*! @return The size of the BSON-encoded unsigned integer in @a j */ - static std::size_t calc_bson_unsigned_size(const std::uint64_t value) + static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept { - if (value <= static_cast((std::numeric_limits::max)())) - { - return sizeof(std::int32_t); - } - else - { - return sizeof(std::int64_t); - } + return (value <= static_cast((std::numeric_limits::max)())) + ? sizeof(std::int32_t) + : sizeof(std::int64_t); } /*! @brief Writes a BSON element with key @a name and unsigned @a value */ - void write_bson_unsigned(const typename BasicJsonType::string_t& name, + void write_bson_unsigned(const string_t& name, const std::uint64_t value) { if (value <= static_cast((std::numeric_limits::max)())) { - write_bson_entry_header(name, 0x10); // int32 + write_bson_entry_header(name, 0x10 /* int32 */); write_number(static_cast(value)); } else if (value <= static_cast((std::numeric_limits::max)())) { - write_bson_entry_header(name, 0x12); // int64 + write_bson_entry_header(name, 0x12 /* int64 */); write_number(static_cast(value)); } else { - JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(value))); + JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(value) + " cannot be represented by BSON as it does not fit int64")); } - } /*! @brief Writes a BSON element with key @a name and object @a value */ - void write_bson_object_entry(const typename BasicJsonType::string_t& name, + void write_bson_object_entry(const string_t& name, const typename BasicJsonType::object_t& value) { write_bson_entry_header(name, 0x03); // object @@ -887,7 +878,7 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and array @a value */ - void write_bson_array(const typename BasicJsonType::string_t& name, + void write_bson_array(const string_t& name, const typename BasicJsonType::array_t& value) { write_bson_entry_header(name, 0x04); // array @@ -900,22 +891,19 @@ class binary_writer write_bson_element(std::to_string(array_index++), el); } - oa->write_character(static_cast(0x00)); + oa->write_character(to_char_type(0x00)); } /*! @brief Calculates the size necessary to serialize the JSON value @a j with its @a name @return The calculated size for the BSON document entry for @a j with the given @a name. */ - static std::size_t calc_bson_element_size(const typename BasicJsonType::string_t& name, + static std::size_t calc_bson_element_size(const string_t& name, const BasicJsonType& j) { const auto header_size = calc_bson_entry_header_size(name); switch (j.type()) { - case value_t::discarded: - return 0ul; - case value_t::object: return header_size + calc_bson_object_size(*j.m_value.object); @@ -955,14 +943,11 @@ class binary_writer current BSON document @return The size of the BSON entry */ - void write_bson_element(const typename BasicJsonType::string_t& name, + void write_bson_element(const string_t& name, const BasicJsonType& j) { switch (j.type()) { - case value_t::discarded: - return; - case value_t::object: return write_bson_object_entry(name, *j.m_value.object); @@ -1003,12 +988,11 @@ class binary_writer */ static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) { - std::size_t document_size = 0; - - for (const auto& el : value) + std::size_t document_size = std::accumulate(value.begin(), value.end(), 0, + [](size_t result, const typename BasicJsonType::object_t::value_type & el) { - document_size += calc_bson_element_size(el.first, el.second); - } + return result += calc_bson_element_size(el.first, el.second); + }); return sizeof(std::int32_t) + document_size + 1ul; } @@ -1026,7 +1010,7 @@ class binary_writer write_bson_element(el.first, el.second); } - oa->write_character(static_cast(0x00)); + oa->write_character(to_char_type(0x00)); } ////////// @@ -1035,12 +1019,12 @@ class binary_writer static constexpr CharType get_cbor_float_prefix(float /*unused*/) { - return static_cast(0xFA); // Single-Precision Float + return to_char_type(0xFA); // Single-Precision Float } static constexpr CharType get_cbor_float_prefix(double /*unused*/) { - return static_cast(0xFB); // Double-Precision Float + return to_char_type(0xFB); // Double-Precision Float } ///////////// @@ -1049,12 +1033,12 @@ class binary_writer static constexpr CharType get_msgpack_float_prefix(float /*unused*/) { - return static_cast(0xCA); // float 32 + return to_char_type(0xCA); // float 32 } static constexpr CharType get_msgpack_float_prefix(double /*unused*/) { - return static_cast(0xCB); // float 64 + return to_char_type(0xCB); // float 64 } //////////// @@ -1084,7 +1068,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('i')); // int8 + oa->write_character(to_char_type('i')); // int8 } write_number(static_cast(n)); } @@ -1092,7 +1076,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('U')); // uint8 + oa->write_character(to_char_type('U')); // uint8 } write_number(static_cast(n)); } @@ -1100,7 +1084,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('I')); // int16 + oa->write_character(to_char_type('I')); // int16 } write_number(static_cast(n)); } @@ -1108,7 +1092,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('l')); // int32 + oa->write_character(to_char_type('l')); // int32 } write_number(static_cast(n)); } @@ -1116,7 +1100,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('L')); // int64 + oa->write_character(to_char_type('L')); // int64 } write_number(static_cast(n)); } @@ -1137,7 +1121,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('i')); // int8 + oa->write_character(to_char_type('i')); // int8 } write_number(static_cast(n)); } @@ -1145,7 +1129,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('U')); // uint8 + oa->write_character(to_char_type('U')); // uint8 } write_number(static_cast(n)); } @@ -1153,7 +1137,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('I')); // int16 + oa->write_character(to_char_type('I')); // int16 } write_number(static_cast(n)); } @@ -1161,7 +1145,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('l')); // int32 + oa->write_character(to_char_type('l')); // int32 } write_number(static_cast(n)); } @@ -1169,7 +1153,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('L')); // int64 + oa->write_character(to_char_type('L')); // int64 } write_number(static_cast(n)); } @@ -1304,6 +1288,46 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } + // The following to_char_type functions are implement the conversion + // between uint8_t and CharType. In case CharType is not unsigned, + // such a conversion is required to allow values greater than 128. + // See for a discussion. + template < typename C = CharType, + enable_if_t < std::is_signed::value and std::is_signed::value > * = nullptr > + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return *reinterpret_cast(&x); + } + + template < typename C = CharType, + enable_if_t < std::is_signed::value and std::is_unsigned::value > * = nullptr > + static CharType to_char_type(std::uint8_t x) noexcept + { + static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); + static_assert(std::is_pod::value, "CharType must be POD"); + CharType result; + std::memcpy(&result, &x, sizeof(x)); + return result; + } + + template::value>* = nullptr> + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return x; + } + + template < typename InputCharType, typename C = CharType, + enable_if_t < + std::is_signed::value and + std::is_signed::value and + std::is_same::type>::value + > * = nullptr > + static constexpr CharType to_char_type(InputCharType x) noexcept + { + return x; + } + private: /// whether we can assume little endianess const bool is_little_endian = binary_reader::little_endianess(); diff --git a/include/nlohmann/detail/output/output_adapters.hpp b/include/nlohmann/detail/output/output_adapters.hpp index 0a37715c..699757d6 100644 --- a/include/nlohmann/detail/output/output_adapters.hpp +++ b/include/nlohmann/detail/output/output_adapters.hpp @@ -30,7 +30,9 @@ template class output_vector_adapter : public output_adapter_protocol { public: - explicit output_vector_adapter(std::vector& vec) : v(vec) {} + explicit output_vector_adapter(std::vector& vec) noexcept + : v(vec) + {} void write_character(CharType c) override { @@ -51,7 +53,9 @@ template class output_stream_adapter : public output_adapter_protocol { public: - explicit output_stream_adapter(std::basic_ostream& s) : stream(s) {} + explicit output_stream_adapter(std::basic_ostream& s) noexcept + : stream(s) + {} void write_character(CharType c) override { @@ -72,7 +76,9 @@ template> class output_string_adapter : public output_adapter_protocol { public: - explicit output_string_adapter(StringType& s) : str(s) {} + explicit output_string_adapter(StringType& s) noexcept + : str(s) + {} void write_character(CharType c) override { diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 79f74e4c..848329e7 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -2115,7 +2115,7 @@ class input_stream_adapter : public input_adapter_protocol class input_buffer_adapter : public input_adapter_protocol { public: - input_buffer_adapter(const char* b, const std::size_t l) + input_buffer_adapter(const char* b, const std::size_t l) noexcept : cursor(b), limit(b + l) {} @@ -2263,7 +2263,9 @@ template class wide_string_input_adapter : public input_adapter_protocol { public: - explicit wide_string_input_adapter(const WideStringType& w) : str(w) {} + explicit wide_string_input_adapter(const WideStringType& w) noexcept + : str(w) + {} std::char_traits::int_type get_character() noexcept override { @@ -6210,7 +6212,9 @@ template class output_vector_adapter : public output_adapter_protocol { public: - explicit output_vector_adapter(std::vector& vec) : v(vec) {} + explicit output_vector_adapter(std::vector& vec) noexcept + : v(vec) + {} void write_character(CharType c) override { @@ -6231,7 +6235,9 @@ template class output_stream_adapter : public output_adapter_protocol { public: - explicit output_stream_adapter(std::basic_ostream& s) : stream(s) {} + explicit output_stream_adapter(std::basic_ostream& s) noexcept + : stream(s) + {} void write_character(CharType c) override { @@ -6252,7 +6258,9 @@ template> class output_string_adapter : public output_adapter_protocol { public: - explicit output_string_adapter(StringType& s) : str(s) {} + explicit output_string_adapter(StringType& s) noexcept + : str(s) + {} void write_character(CharType c) override { @@ -6369,6 +6377,10 @@ class binary_reader switch (format) { + case input_format_t::bson: + result = parse_bson_internal(); + break; + case input_format_t::cbor: result = parse_cbor_internal(); break; @@ -6381,10 +6393,6 @@ class binary_reader result = parse_ubjson_internal(); break; - case input_format_t::bson: - result = parse_bson_internal(); - break; - // LCOV_EXCL_START default: assert(false); @@ -6436,8 +6444,8 @@ class binary_reader */ bool parse_bson_internal() { - std::int32_t documentSize; - get_number(input_format_t::bson, documentSize); + std::int32_t document_size; + get_number(input_format_t::bson, document_size); if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1)))) { @@ -6616,8 +6624,8 @@ class binary_reader */ bool parse_bson_array() { - std::int32_t documentSize; - get_number(input_format_t::bson, documentSize); + std::int32_t document_size; + get_number(input_format_t::bson, document_size); if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1)))) { @@ -8303,6 +8311,8 @@ namespace detail template class binary_writer { + using string_t = typename BasicJsonType::string_t; + public: /*! @brief create a binary writer @@ -8328,11 +8338,6 @@ class binary_writer break; } - case value_t::discarded: - { - break; - } - default: { JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()))); @@ -8349,15 +8354,15 @@ class binary_writer { case value_t::null: { - oa->write_character(static_cast(0xF6)); + oa->write_character(to_char_type(0xF6)); break; } case value_t::boolean: { oa->write_character(j.m_value.boolean - ? static_cast(0xF5) - : static_cast(0xF4)); + ? to_char_type(0xF5) + : to_char_type(0xF4)); break; } @@ -8374,22 +8379,22 @@ class binary_writer } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x18)); + oa->write_character(to_char_type(0x18)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x19)); + oa->write_character(to_char_type(0x19)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x1A)); + oa->write_character(to_char_type(0x1A)); write_number(static_cast(j.m_value.number_integer)); } else { - oa->write_character(static_cast(0x1B)); + oa->write_character(to_char_type(0x1B)); write_number(static_cast(j.m_value.number_integer)); } } @@ -8404,22 +8409,22 @@ class binary_writer } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x38)); + oa->write_character(to_char_type(0x38)); write_number(static_cast(positive_number)); } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x39)); + oa->write_character(to_char_type(0x39)); write_number(static_cast(positive_number)); } else if (positive_number <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x3A)); + oa->write_character(to_char_type(0x3A)); write_number(static_cast(positive_number)); } else { - oa->write_character(static_cast(0x3B)); + oa->write_character(to_char_type(0x3B)); write_number(static_cast(positive_number)); } } @@ -8434,22 +8439,22 @@ class binary_writer } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x18)); + oa->write_character(to_char_type(0x18)); write_number(static_cast(j.m_value.number_unsigned)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x19)); + oa->write_character(to_char_type(0x19)); write_number(static_cast(j.m_value.number_unsigned)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x1A)); + oa->write_character(to_char_type(0x1A)); write_number(static_cast(j.m_value.number_unsigned)); } else { - oa->write_character(static_cast(0x1B)); + oa->write_character(to_char_type(0x1B)); write_number(static_cast(j.m_value.number_unsigned)); } break; @@ -8472,23 +8477,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x78)); + oa->write_character(to_char_type(0x78)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x79)); + oa->write_character(to_char_type(0x79)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x7A)); + oa->write_character(to_char_type(0x7A)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x7B)); + oa->write_character(to_char_type(0x7B)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -8510,23 +8515,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x98)); + oa->write_character(to_char_type(0x98)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x99)); + oa->write_character(to_char_type(0x99)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x9A)); + oa->write_character(to_char_type(0x9A)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0x9B)); + oa->write_character(to_char_type(0x9B)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -8549,23 +8554,23 @@ class binary_writer } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xB8)); + oa->write_character(to_char_type(0xB8)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xB9)); + oa->write_character(to_char_type(0xB9)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xBA)); + oa->write_character(to_char_type(0xBA)); write_number(static_cast(N)); } // LCOV_EXCL_START else if (N <= (std::numeric_limits::max)()) { - oa->write_character(static_cast(0xBB)); + oa->write_character(to_char_type(0xBB)); write_number(static_cast(N)); } // LCOV_EXCL_STOP @@ -8593,15 +8598,15 @@ class binary_writer { case value_t::null: // nil { - oa->write_character(static_cast(0xC0)); + oa->write_character(to_char_type(0xC0)); break; } case value_t::boolean: // true and false { oa->write_character(j.m_value.boolean - ? static_cast(0xC3) - : static_cast(0xC2)); + ? to_char_type(0xC3) + : to_char_type(0xC2)); break; } @@ -8620,25 +8625,25 @@ class binary_writer else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 8 - oa->write_character(static_cast(0xCC)); + oa->write_character(to_char_type(0xCC)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 16 - oa->write_character(static_cast(0xCD)); + oa->write_character(to_char_type(0xCD)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 32 - oa->write_character(static_cast(0xCE)); + oa->write_character(to_char_type(0xCE)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 64 - oa->write_character(static_cast(0xCF)); + oa->write_character(to_char_type(0xCF)); write_number(static_cast(j.m_value.number_integer)); } } @@ -8653,28 +8658,28 @@ class binary_writer j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 8 - oa->write_character(static_cast(0xD0)); + oa->write_character(to_char_type(0xD0)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 16 - oa->write_character(static_cast(0xD1)); + oa->write_character(to_char_type(0xD1)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 32 - oa->write_character(static_cast(0xD2)); + oa->write_character(to_char_type(0xD2)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_integer >= (std::numeric_limits::min)() and j.m_value.number_integer <= (std::numeric_limits::max)()) { // int 64 - oa->write_character(static_cast(0xD3)); + oa->write_character(to_char_type(0xD3)); write_number(static_cast(j.m_value.number_integer)); } } @@ -8691,25 +8696,25 @@ class binary_writer else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 8 - oa->write_character(static_cast(0xCC)); + oa->write_character(to_char_type(0xCC)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 16 - oa->write_character(static_cast(0xCD)); + oa->write_character(to_char_type(0xCD)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 32 - oa->write_character(static_cast(0xCE)); + oa->write_character(to_char_type(0xCE)); write_number(static_cast(j.m_value.number_integer)); } else if (j.m_value.number_unsigned <= (std::numeric_limits::max)()) { // uint 64 - oa->write_character(static_cast(0xCF)); + oa->write_character(to_char_type(0xCF)); write_number(static_cast(j.m_value.number_integer)); } break; @@ -8734,19 +8739,19 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // str 8 - oa->write_character(static_cast(0xD9)); + oa->write_character(to_char_type(0xD9)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // str 16 - oa->write_character(static_cast(0xDA)); + oa->write_character(to_char_type(0xDA)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // str 32 - oa->write_character(static_cast(0xDB)); + oa->write_character(to_char_type(0xDB)); write_number(static_cast(N)); } @@ -8769,13 +8774,13 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // array 16 - oa->write_character(static_cast(0xDC)); + oa->write_character(to_char_type(0xDC)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // array 32 - oa->write_character(static_cast(0xDD)); + oa->write_character(to_char_type(0xDD)); write_number(static_cast(N)); } @@ -8799,13 +8804,13 @@ class binary_writer else if (N <= (std::numeric_limits::max)()) { // map 16 - oa->write_character(static_cast(0xDE)); + oa->write_character(to_char_type(0xDE)); write_number(static_cast(N)); } else if (N <= (std::numeric_limits::max)()) { // map 32 - oa->write_character(static_cast(0xDF)); + oa->write_character(to_char_type(0xDF)); write_number(static_cast(N)); } @@ -8838,7 +8843,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('Z')); + oa->write_character(to_char_type('Z')); } break; } @@ -8848,8 +8853,8 @@ class binary_writer if (add_prefix) { oa->write_character(j.m_value.boolean - ? static_cast('T') - : static_cast('F')); + ? to_char_type('T') + : to_char_type('F')); } break; } @@ -8876,7 +8881,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('S')); + oa->write_character(to_char_type('S')); } write_number_with_ubjson_prefix(j.m_value.string->size(), true); oa->write_characters( @@ -8889,7 +8894,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('[')); + oa->write_character(to_char_type('[')); } bool prefix_required = true; @@ -8906,14 +8911,14 @@ class binary_writer if (same_prefix) { prefix_required = false; - oa->write_character(static_cast('$')); + oa->write_character(to_char_type('$')); oa->write_character(first_prefix); } } if (use_count) { - oa->write_character(static_cast('#')); + oa->write_character(to_char_type('#')); write_number_with_ubjson_prefix(j.m_value.array->size(), true); } @@ -8924,7 +8929,7 @@ class binary_writer if (not use_count) { - oa->write_character(static_cast(']')); + oa->write_character(to_char_type(']')); } break; @@ -8934,7 +8939,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('{')); + oa->write_character(to_char_type('{')); } bool prefix_required = true; @@ -8951,14 +8956,14 @@ class binary_writer if (same_prefix) { prefix_required = false; - oa->write_character(static_cast('$')); + oa->write_character(to_char_type('$')); oa->write_character(first_prefix); } } if (use_count) { - oa->write_character(static_cast('#')); + oa->write_character(to_char_type('#')); write_number_with_ubjson_prefix(j.m_value.object->size(), true); } @@ -8973,7 +8978,7 @@ class binary_writer if (not use_count) { - oa->write_character(static_cast('}')); + oa->write_character(to_char_type('}')); } break; @@ -8993,9 +8998,9 @@ class binary_writer @return The size of a BSON document entry header, including the id marker and the entry name size (and its null-terminator). */ - static std::size_t calc_bson_entry_header_size(const typename BasicJsonType::string_t& name) + static std::size_t calc_bson_entry_header_size(const string_t& name) { - const auto it = name.find(static_cast(0)); + const auto it = name.find(static_cast(0)); if (JSON_UNLIKELY(it != BasicJsonType::string_t::npos)) { JSON_THROW(out_of_range::create(409, @@ -9008,10 +9013,10 @@ class binary_writer /*! @brief Writes the given @a element_type and @a name to the output adapter */ - void write_bson_entry_header(const typename BasicJsonType::string_t& name, - std::uint8_t element_type) + void write_bson_entry_header(const string_t& name, + const std::uint8_t element_type) { - oa->write_character(static_cast(element_type)); // boolean + oa->write_character(to_char_type(element_type)); // boolean oa->write_characters( reinterpret_cast(name.c_str()), name.size() + 1u); @@ -9020,17 +9025,17 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and boolean value @a value */ - void write_bson_boolean(const typename BasicJsonType::string_t& name, + void write_bson_boolean(const string_t& name, const bool value) { write_bson_entry_header(name, 0x08); - oa->write_character(value ? static_cast(0x01) : static_cast(0x00)); + oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00)); } /*! @brief Writes a BSON element with key @a name and double value @a value */ - void write_bson_double(const typename BasicJsonType::string_t& name, + void write_bson_double(const string_t& name, const double value) { write_bson_entry_header(name, 0x01); @@ -9040,7 +9045,7 @@ class binary_writer /*! @return The size of the BSON-encoded string in @a value */ - static std::size_t calc_bson_string_size(const typename BasicJsonType::string_t& value) + static std::size_t calc_bson_string_size(const string_t& value) { return sizeof(std::int32_t) + value.size() + 1ul; } @@ -9048,8 +9053,8 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and string value @a value */ - void write_bson_string(const typename BasicJsonType::string_t& name, - const typename BasicJsonType::string_t& value) + void write_bson_string(const string_t& name, + const string_t& value) { write_bson_entry_header(name, 0x02); @@ -9062,7 +9067,7 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and null value */ - void write_bson_null(const typename BasicJsonType::string_t& name) + void write_bson_null(const string_t& name) { write_bson_entry_header(name, 0x0A); } @@ -9085,7 +9090,7 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and integer @a value */ - void write_bson_integer(const typename BasicJsonType::string_t& name, + void write_bson_integer(const string_t& name, const std::int64_t value) { if ((std::numeric_limits::min)() <= value and value <= (std::numeric_limits::max)()) @@ -9103,45 +9108,39 @@ class binary_writer /*! @return The size of the BSON-encoded unsigned integer in @a j */ - static std::size_t calc_bson_unsigned_size(const std::uint64_t value) + static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept { - if (value <= static_cast((std::numeric_limits::max)())) - { - return sizeof(std::int32_t); - } - else - { - return sizeof(std::int64_t); - } + return (value <= static_cast((std::numeric_limits::max)())) + ? sizeof(std::int32_t) + : sizeof(std::int64_t); } /*! @brief Writes a BSON element with key @a name and unsigned @a value */ - void write_bson_unsigned(const typename BasicJsonType::string_t& name, + void write_bson_unsigned(const string_t& name, const std::uint64_t value) { if (value <= static_cast((std::numeric_limits::max)())) { - write_bson_entry_header(name, 0x10); // int32 + write_bson_entry_header(name, 0x10 /* int32 */); write_number(static_cast(value)); } else if (value <= static_cast((std::numeric_limits::max)())) { - write_bson_entry_header(name, 0x12); // int64 + write_bson_entry_header(name, 0x12 /* int64 */); write_number(static_cast(value)); } else { - JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(value))); + JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(value) + " cannot be represented by BSON as it does not fit int64")); } - } /*! @brief Writes a BSON element with key @a name and object @a value */ - void write_bson_object_entry(const typename BasicJsonType::string_t& name, + void write_bson_object_entry(const string_t& name, const typename BasicJsonType::object_t& value) { write_bson_entry_header(name, 0x03); // object @@ -9167,7 +9166,7 @@ class binary_writer /*! @brief Writes a BSON element with key @a name and array @a value */ - void write_bson_array(const typename BasicJsonType::string_t& name, + void write_bson_array(const string_t& name, const typename BasicJsonType::array_t& value) { write_bson_entry_header(name, 0x04); // array @@ -9180,22 +9179,19 @@ class binary_writer write_bson_element(std::to_string(array_index++), el); } - oa->write_character(static_cast(0x00)); + oa->write_character(to_char_type(0x00)); } /*! @brief Calculates the size necessary to serialize the JSON value @a j with its @a name @return The calculated size for the BSON document entry for @a j with the given @a name. */ - static std::size_t calc_bson_element_size(const typename BasicJsonType::string_t& name, + static std::size_t calc_bson_element_size(const string_t& name, const BasicJsonType& j) { const auto header_size = calc_bson_entry_header_size(name); switch (j.type()) { - case value_t::discarded: - return 0ul; - case value_t::object: return header_size + calc_bson_object_size(*j.m_value.object); @@ -9235,14 +9231,11 @@ class binary_writer current BSON document @return The size of the BSON entry */ - void write_bson_element(const typename BasicJsonType::string_t& name, + void write_bson_element(const string_t& name, const BasicJsonType& j) { switch (j.type()) { - case value_t::discarded: - return; - case value_t::object: return write_bson_object_entry(name, *j.m_value.object); @@ -9283,12 +9276,11 @@ class binary_writer */ static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) { - std::size_t document_size = 0; - - for (const auto& el : value) + std::size_t document_size = std::accumulate(value.begin(), value.end(), 0, + [](size_t result, const typename BasicJsonType::object_t::value_type & el) { - document_size += calc_bson_element_size(el.first, el.second); - } + return result += calc_bson_element_size(el.first, el.second); + }); return sizeof(std::int32_t) + document_size + 1ul; } @@ -9306,7 +9298,7 @@ class binary_writer write_bson_element(el.first, el.second); } - oa->write_character(static_cast(0x00)); + oa->write_character(to_char_type(0x00)); } ////////// @@ -9315,12 +9307,12 @@ class binary_writer static constexpr CharType get_cbor_float_prefix(float /*unused*/) { - return static_cast(0xFA); // Single-Precision Float + return to_char_type(0xFA); // Single-Precision Float } static constexpr CharType get_cbor_float_prefix(double /*unused*/) { - return static_cast(0xFB); // Double-Precision Float + return to_char_type(0xFB); // Double-Precision Float } ///////////// @@ -9329,12 +9321,12 @@ class binary_writer static constexpr CharType get_msgpack_float_prefix(float /*unused*/) { - return static_cast(0xCA); // float 32 + return to_char_type(0xCA); // float 32 } static constexpr CharType get_msgpack_float_prefix(double /*unused*/) { - return static_cast(0xCB); // float 64 + return to_char_type(0xCB); // float 64 } //////////// @@ -9364,7 +9356,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('i')); // int8 + oa->write_character(to_char_type('i')); // int8 } write_number(static_cast(n)); } @@ -9372,7 +9364,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('U')); // uint8 + oa->write_character(to_char_type('U')); // uint8 } write_number(static_cast(n)); } @@ -9380,7 +9372,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('I')); // int16 + oa->write_character(to_char_type('I')); // int16 } write_number(static_cast(n)); } @@ -9388,7 +9380,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('l')); // int32 + oa->write_character(to_char_type('l')); // int32 } write_number(static_cast(n)); } @@ -9396,7 +9388,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('L')); // int64 + oa->write_character(to_char_type('L')); // int64 } write_number(static_cast(n)); } @@ -9417,7 +9409,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('i')); // int8 + oa->write_character(to_char_type('i')); // int8 } write_number(static_cast(n)); } @@ -9425,7 +9417,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('U')); // uint8 + oa->write_character(to_char_type('U')); // uint8 } write_number(static_cast(n)); } @@ -9433,7 +9425,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('I')); // int16 + oa->write_character(to_char_type('I')); // int16 } write_number(static_cast(n)); } @@ -9441,7 +9433,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('l')); // int32 + oa->write_character(to_char_type('l')); // int32 } write_number(static_cast(n)); } @@ -9449,7 +9441,7 @@ class binary_writer { if (add_prefix) { - oa->write_character(static_cast('L')); // int64 + oa->write_character(to_char_type('L')); // int64 } write_number(static_cast(n)); } @@ -9584,6 +9576,46 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } + // The following to_char_type functions are implement the conversion + // between uint8_t and CharType. In case CharType is not unsigned, + // such a conversion is required to allow values greater than 128. + // See for a discussion. + template < typename C = CharType, + enable_if_t < std::is_signed::value and std::is_signed::value > * = nullptr > + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return *reinterpret_cast(&x); + } + + template < typename C = CharType, + enable_if_t < std::is_signed::value and std::is_unsigned::value > * = nullptr > + static CharType to_char_type(std::uint8_t x) noexcept + { + static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t"); + static_assert(std::is_pod::value, "CharType must be POD"); + CharType result; + std::memcpy(&result, &x, sizeof(x)); + return result; + } + + template::value>* = nullptr> + static constexpr CharType to_char_type(std::uint8_t x) noexcept + { + return x; + } + + template < typename InputCharType, typename C = CharType, + enable_if_t < + std::is_signed::value and + std::is_signed::value and + std::is_same::type>::value + > * = nullptr > + static constexpr CharType to_char_type(InputCharType x) noexcept + { + return x; + } + private: /// whether we can assume little endianess const bool is_little_endian = binary_reader::little_endianess(); diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index aeb7b898..d88a03e2 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -37,14 +37,6 @@ TEST_CASE("BSON") { SECTION("individual values not supported") { - SECTION("discarded") - { - // discarded values are not serialized - json j = json::value_t::discarded; - const auto result = json::to_bson(j); - CHECK(result.empty()); - } - SECTION("null") { json j = nullptr; @@ -392,32 +384,6 @@ TEST_CASE("BSON") CHECK(json::from_bson(result, true, false) == j); } - SECTION("discarded values are not serialized") - { - json j = json::value_t::discarded; - const auto result = json::to_bson(j); - CHECK(result.empty()); - } - - SECTION("discarded members are not serialized") - { - json j = - { - { "entry", json::value_t::discarded } - }; - - std::vector expected = - { - 0x05, 0x00, 0x00, 0x00, // size (little endian) - // no entries - 0x00 // end marker - }; - - const auto result = json::to_bson(j); - CHECK(result == expected); - } - - SECTION("non-empty object with object member") { json j = @@ -1136,7 +1102,7 @@ TEST_CASE("BSON numerical data") }; CHECK_THROWS_AS(json::to_bson(j), json::out_of_range&); - CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.407] number overflow serializing " + std::to_string(i)); + CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.407] integer number " + std::to_string(i) + " cannot be represented by BSON as it does not fit int64"); } } From 7d0dc10169e367ca5bee06a9649c2a8a0763faf7 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sat, 27 Oct 2018 18:34:35 +0200 Subject: [PATCH 68/77] :rotating_light: fixed a linter warning --- include/nlohmann/detail/output/binary_writer.hpp | 2 +- single_include/nlohmann/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 5c2a58f7..8e8f5ea7 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -988,7 +988,7 @@ class binary_writer */ static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) { - std::size_t document_size = std::accumulate(value.begin(), value.end(), 0, + std::size_t document_size = std::accumulate(value.begin(), value.end(), 0ul, [](size_t result, const typename BasicJsonType::object_t::value_type & el) { return result += calc_bson_element_size(el.first, el.second); diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index d288086e..51e97871 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -9307,7 +9307,7 @@ class binary_writer */ static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value) { - std::size_t document_size = std::accumulate(value.begin(), value.end(), 0, + std::size_t document_size = std::accumulate(value.begin(), value.end(), 0ul, [](size_t result, const typename BasicJsonType::object_t::value_type & el) { return result += calc_bson_element_size(el.first, el.second); From 24946f67f1b70ff1b00a04a62246dbc2fd402c5f Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 28 Oct 2018 09:15:41 +0100 Subject: [PATCH 69/77] :rotating_light: fixed some more linter warnings --- include/nlohmann/adl_serializer.hpp | 14 ++++---- include/nlohmann/detail/json_pointer.hpp | 6 ++-- include/nlohmann/detail/macro_scope.hpp | 2 +- include/nlohmann/json.hpp | 20 +++++------ single_include/nlohmann/json.hpp | 42 ++++++++++++------------ 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/include/nlohmann/adl_serializer.hpp b/include/nlohmann/adl_serializer.hpp index 35be76fd..eeaa1425 100644 --- a/include/nlohmann/adl_serializer.hpp +++ b/include/nlohmann/adl_serializer.hpp @@ -7,6 +7,7 @@ namespace nlohmann { + template struct adl_serializer { @@ -16,14 +17,13 @@ struct adl_serializer This function is usually called by the `get()` function of the @ref basic_json class (either explicit or via conversion operators). - @param[in] j JSON value to read from + @param[in] j JSON value to read from @param[in,out] val value to write to */ template static auto from_json(BasicJsonType&& j, ValueType& val) noexcept( - noexcept(::nlohmann::from_json(std::forward(j), val))) -> decltype( - ::nlohmann::from_json(std::forward(j), val), void() - ) + noexcept(::nlohmann::from_json(std::forward(j), val))) + -> decltype(::nlohmann::from_json(std::forward(j), val), void()) { ::nlohmann::from_json(std::forward(j), val); } @@ -35,15 +35,15 @@ struct adl_serializer class. @param[in,out] j JSON value to write to - @param[in] val value to read from + @param[in] val value to read from */ template static auto to_json(BasicJsonType& j, ValueType&& val) noexcept( noexcept(::nlohmann::to_json(j, std::forward(val)))) - -> decltype(::nlohmann::to_json(j, std::forward(val)), - void()) + -> decltype(::nlohmann::to_json(j, std::forward(val)), void()) { ::nlohmann::to_json(j, std::forward(val)); } }; + } // namespace nlohmann diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index b2bc4727..87daa93c 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -59,7 +59,7 @@ class json_pointer @since version 2.0.0 */ - std::string to_string() const noexcept + std::string to_string() const { return std::accumulate(reference_tokens.begin(), reference_tokens.end(), std::string{}, @@ -114,7 +114,7 @@ class json_pointer } /// return whether pointer points to the root document - bool is_root() const + bool is_root() const noexcept { return reference_tokens.empty(); } @@ -566,7 +566,7 @@ class json_pointer {} } - /// escape "~"" to "~0" and "/" to "~1" + /// escape "~" to "~0" and "/" to "~1" static std::string escape(std::string s) { replace_substring(s, "~", "~0"); diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp index 5e42a0e8..26db6671 100644 --- a/include/nlohmann/detail/macro_scope.hpp +++ b/include/nlohmann/detail/macro_scope.hpp @@ -89,7 +89,7 @@ /*! @brief macro to briefly define a mapping between an enum and JSON -@macro NLOHMANN_JSON_SERIALIZE_ENUM +@def NLOHMANN_JSON_SERIALIZE_ENUM @since version 3.4.0 */ #define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 0a46d0c2..fe6ba6fa 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -3405,7 +3405,7 @@ class basic_json /*! @brief overload for a default value of type const char* - @copydoc basic_json::value(const typename object_t::key_type&, ValueType) const + @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const */ string_t value(const typename object_t::key_type& key, const char* default_value) const { @@ -6673,9 +6673,10 @@ class basic_json @complexity Linear in the size of the JSON value @a j. @sa http://bsonspec.org/spec.html - @sa @ref from_bson(detail::input_adapter, const bool strict) for the + @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the analogous deserialization - @sa @ref to_ubjson(const basic_json&) for the related UBJSON format + @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the + related UBJSON format @sa @ref to_cbor(const basic_json&) for the related CBOR format @sa @ref to_msgpack(const basic_json&) for the related MessagePack format */ @@ -6902,7 +6903,7 @@ class basic_json related CBOR format @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the related UBJSON format - @sa @ref from_bson(detail::input_adapter, const bool, const bool) for + @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for the related BSON format @since version 2.0.9; parameter @a start_index since 2.1.1; changed to @@ -6989,7 +6990,7 @@ class basic_json related CBOR format @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the related MessagePack format - @sa @ref from_bson(detail::input_adapter, const bool, const bool) for + @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for the related BSON format @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0 @@ -7068,13 +7069,12 @@ class basic_json @throw parse_error.114 if an unsupported BSON record type is encountered @sa http://bsonspec.org/spec.html - @sa @ref to_bson(const basic_json&, const bool, const bool) for the - analogous serialization - @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the + @sa @ref to_bson(const basic_json&) for the analogous serialization + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the related CBOR format - @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the related MessagePack format - @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the related UBJSON format */ static basic_json from_bson(detail::input_adapter&& i, diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 51e97871..058cc093 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -204,7 +204,7 @@ using json = basic_json<>; /*! @brief macro to briefly define a mapping between an enum and JSON -@macro NLOHMANN_JSON_SERIALIZE_ENUM +@def NLOHMANN_JSON_SERIALIZE_ENUM @since version 3.4.0 */ #define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ @@ -11635,7 +11635,7 @@ class json_pointer @since version 2.0.0 */ - std::string to_string() const noexcept + std::string to_string() const { return std::accumulate(reference_tokens.begin(), reference_tokens.end(), std::string{}, @@ -11690,7 +11690,7 @@ class json_pointer } /// return whether pointer points to the root document - bool is_root() const + bool is_root() const noexcept { return reference_tokens.empty(); } @@ -12142,7 +12142,7 @@ class json_pointer {} } - /// escape "~"" to "~0" and "/" to "~1" + /// escape "~" to "~0" and "/" to "~1" static std::string escape(std::string s) { replace_substring(s, "~", "~0"); @@ -12283,6 +12283,7 @@ class json_pointer namespace nlohmann { + template struct adl_serializer { @@ -12292,14 +12293,13 @@ struct adl_serializer This function is usually called by the `get()` function of the @ref basic_json class (either explicit or via conversion operators). - @param[in] j JSON value to read from + @param[in] j JSON value to read from @param[in,out] val value to write to */ template static auto from_json(BasicJsonType&& j, ValueType& val) noexcept( - noexcept(::nlohmann::from_json(std::forward(j), val))) -> decltype( - ::nlohmann::from_json(std::forward(j), val), void() - ) + noexcept(::nlohmann::from_json(std::forward(j), val))) + -> decltype(::nlohmann::from_json(std::forward(j), val), void()) { ::nlohmann::from_json(std::forward(j), val); } @@ -12311,17 +12311,17 @@ struct adl_serializer class. @param[in,out] j JSON value to write to - @param[in] val value to read from + @param[in] val value to read from */ template static auto to_json(BasicJsonType& j, ValueType&& val) noexcept( noexcept(::nlohmann::to_json(j, std::forward(val)))) - -> decltype(::nlohmann::to_json(j, std::forward(val)), - void()) + -> decltype(::nlohmann::to_json(j, std::forward(val)), void()) { ::nlohmann::to_json(j, std::forward(val)); } }; + } // namespace nlohmann @@ -15660,7 +15660,7 @@ class basic_json /*! @brief overload for a default value of type const char* - @copydoc basic_json::value(const typename object_t::key_type&, ValueType) const + @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const */ string_t value(const typename object_t::key_type& key, const char* default_value) const { @@ -18928,9 +18928,10 @@ class basic_json @complexity Linear in the size of the JSON value @a j. @sa http://bsonspec.org/spec.html - @sa @ref from_bson(detail::input_adapter, const bool strict) for the + @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the analogous deserialization - @sa @ref to_ubjson(const basic_json&) for the related UBJSON format + @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the + related UBJSON format @sa @ref to_cbor(const basic_json&) for the related CBOR format @sa @ref to_msgpack(const basic_json&) for the related MessagePack format */ @@ -19157,7 +19158,7 @@ class basic_json related CBOR format @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the related UBJSON format - @sa @ref from_bson(detail::input_adapter, const bool, const bool) for + @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for the related BSON format @since version 2.0.9; parameter @a start_index since 2.1.1; changed to @@ -19244,7 +19245,7 @@ class basic_json related CBOR format @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the related MessagePack format - @sa @ref from_bson(detail::input_adapter, const bool, const bool) for + @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for the related BSON format @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0 @@ -19323,13 +19324,12 @@ class basic_json @throw parse_error.114 if an unsupported BSON record type is encountered @sa http://bsonspec.org/spec.html - @sa @ref to_bson(const basic_json&, const bool, const bool) for the - analogous serialization - @sa @ref from_cbor(detail::input_adapter, const bool, const bool) for the + @sa @ref to_bson(const basic_json&) for the analogous serialization + @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the related CBOR format - @sa @ref from_msgpack(detail::input_adapter, const bool, const bool) for + @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the related MessagePack format - @sa @ref from_ubjson(detail::input_adapter, const bool, const bool) for the + @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the related UBJSON format */ static basic_json from_bson(detail::input_adapter&& i, From f0c145955466c7180664118922f660d7fda0b51d Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 28 Oct 2018 09:16:40 +0100 Subject: [PATCH 70/77] :bug: fixed a bug parsing BSON strings #1320 --- include/nlohmann/detail/input/binary_reader.hpp | 8 +++++++- single_include/nlohmann/json.hpp | 6 ++++++ test/src/unit-bson.cpp | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index ed2d66fd..403a4d01 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -186,12 +186,18 @@ class binary_reader @param[in, out] result A reference to the string variable where the read string is to be stored. @tparam NumberType The type of the length @a len - @pre len > 0 + @pre len >= 1 @return `true` if the string was successfully parsed */ template bool get_bson_string(const NumberType len, string_t& result) { + if (JSON_UNLIKELY(len < 1)) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"))); + } + return get_string(input_format_t::bson, len - static_cast(1), result) and get() != std::char_traits::eof(); } diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 058cc093..e758206c 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -6532,6 +6532,12 @@ class binary_reader template bool get_bson_string(const NumberType len, string_t& result) { + if (JSON_UNLIKELY(len < 1)) + { + auto last_token = get_token_string(); + return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"))); + } + return get_string(input_format_t::bson, len - static_cast(1), result) and get() != std::char_traits::eof(); } diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index d88a03e2..36dacb46 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -100,6 +100,20 @@ TEST_CASE("BSON") CHECK_THROWS_WITH(json::to_bson(j), "[json.exception.out_of_range.409] BSON key cannot contain code point U+0000 (at byte 2)"); } + SECTION("string length must be at least 1") + { + // from https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11175 + std::vector v = + { + 0x20, 0x20, 0x20, 0x20, + 0x02, + 0x00, + 0x00, 0x00, 0x00, 0x80 + }; + CHECK_THROWS_AS(json::from_bson(v), json::parse_error&); + CHECK_THROWS_WITH(json::from_bson(v), "[json.exception.parse_error.112] parse error at byte 10: syntax error while parsing BSON string: string length must be at least 1, is -2147483648"); + } + SECTION("objects") { SECTION("empty object") From d2e4f0b0d9eca098851bc6da21eb8bcc7555b054 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 28 Oct 2018 14:20:20 +0100 Subject: [PATCH 71/77] :pencil2: fixed some typos --- include/nlohmann/detail/input/parser.hpp | 4 +-- include/nlohmann/detail/meta/type_traits.hpp | 18 +++++----- .../nlohmann/detail/output/binary_writer.hpp | 1 + include/nlohmann/detail/output/serializer.hpp | 7 ++-- include/nlohmann/json.hpp | 2 +- single_include/nlohmann/json.hpp | 35 ++++++++++--------- 6 files changed, 36 insertions(+), 31 deletions(-) diff --git a/include/nlohmann/detail/input/parser.hpp b/include/nlohmann/detail/input/parser.hpp index ac19bb8c..f5744196 100644 --- a/include/nlohmann/detail/input/parser.hpp +++ b/include/nlohmann/detail/input/parser.hpp @@ -167,7 +167,7 @@ class parser template bool sax_parse_internal(SAX* sax) { - // stack to remember the hieararchy of structured values we are parsing + // stack to remember the hierarchy of structured values we are parsing // true = array; false = object std::vector states; // value to avoid a goto (see comment where set to true) @@ -351,7 +351,7 @@ class parser // we reached this line after we successfully parsed a value if (states.empty()) { - // empty stack: we reached the end of the hieararchy: done + // empty stack: we reached the end of the hierarchy: done return true; } else diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index 4c4c4d3d..801df342 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -221,28 +221,28 @@ struct is_compatible_string_type_impl < std::is_constructible::value; }; -template +template struct is_compatible_string_type - : is_compatible_string_type_impl {}; + : is_compatible_string_type_impl {}; -template struct is_constructible_string_type_impl : std::false_type {}; -template +template struct is_constructible_string_type_impl < - BasicJsonType, ConstrutibleStringType, + BasicJsonType, ConstructibleStringType, enable_if_t::value >> + value_type_t, ConstructibleStringType>::value >> { static constexpr auto value = - std::is_constructible::value; }; -template +template struct is_constructible_string_type - : is_constructible_string_type_impl {}; + : is_constructible_string_type_impl {}; template struct is_compatible_array_type_impl : std::false_type {}; diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 8e8f5ea7..ca819540 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -1287,6 +1287,7 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } + public: // The following to_char_type functions are implement the conversion // between uint8_t and CharType. In case CharType is not unsigned, // such a conversion is required to allow values greater than 128. diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index 41f248a2..a709a8ec 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -449,9 +450,9 @@ class serializer } else { - string_buffer[bytes++] = '\xEF'; - string_buffer[bytes++] = '\xBF'; - string_buffer[bytes++] = '\xBD'; + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xEF'); + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xBF'); + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xBD'); } bytes_after_last_accept = bytes; } diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index fe6ba6fa..fdd692cb 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -6750,7 +6750,7 @@ class basic_json map | object | 0xBF False | `false` | 0xF4 True | `true` | 0xF5 - Nill | `null` | 0xF6 + Null | `null` | 0xF6 Half-Precision Float | number_float | 0xF9 Single-Precision Float | number_float | 0xFA Double-Precision Float | number_float | 0xFB diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index e758206c..d35db62c 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -612,28 +612,28 @@ struct is_compatible_string_type_impl < std::is_constructible::value; }; -template +template struct is_compatible_string_type - : is_compatible_string_type_impl {}; + : is_compatible_string_type_impl {}; -template struct is_constructible_string_type_impl : std::false_type {}; -template +template struct is_constructible_string_type_impl < - BasicJsonType, ConstrutibleStringType, + BasicJsonType, ConstructibleStringType, enable_if_t::value >> + value_type_t, ConstructibleStringType>::value >> { static constexpr auto value = - std::is_constructible::value; }; -template +template struct is_constructible_string_type - : is_constructible_string_type_impl {}; + : is_constructible_string_type_impl {}; template struct is_compatible_array_type_impl : std::false_type {}; @@ -4979,7 +4979,7 @@ class parser template bool sax_parse_internal(SAX* sax) { - // stack to remember the hieararchy of structured values we are parsing + // stack to remember the hierarchy of structured values we are parsing // true = array; false = object std::vector states; // value to avoid a goto (see comment where set to true) @@ -5163,7 +5163,7 @@ class parser // we reached this line after we successfully parsed a value if (states.empty()) { - // empty stack: we reached the end of the hieararchy: done + // empty stack: we reached the end of the hierarchy: done return true; } else @@ -6526,7 +6526,7 @@ class binary_reader @param[in, out] result A reference to the string variable where the read string is to be stored. @tparam NumberType The type of the length @a len - @pre len > 0 + @pre len >= 1 @return `true` if the string was successfully parsed */ template @@ -9612,6 +9612,7 @@ class binary_writer oa->write_characters(vec.data(), sizeof(NumberType)); } + public: // The following to_char_type functions are implement the conversion // between uint8_t and CharType. In case CharType is not unsigned, // such a conversion is required to allow values greater than 128. @@ -10780,6 +10781,8 @@ char* to_chars(char* first, const char* last, FloatType value) // #include +// #include + // #include // #include @@ -11214,9 +11217,9 @@ class serializer } else { - string_buffer[bytes++] = '\xEF'; - string_buffer[bytes++] = '\xBF'; - string_buffer[bytes++] = '\xBD'; + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xEF'); + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xBF'); + string_buffer[bytes++] = detail::binary_writer::to_char_type('\xBD'); } bytes_after_last_accept = bytes; } @@ -19011,7 +19014,7 @@ class basic_json map | object | 0xBF False | `false` | 0xF4 True | `true` | 0xF5 - Nill | `null` | 0xF6 + Null | `null` | 0xF6 Half-Precision Float | number_float | 0xF9 Single-Precision Float | number_float | 0xFA Double-Precision Float | number_float | 0xFB From 86b5ce953a4339e444f656353a6aaad378cae36d Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Sun, 28 Oct 2018 15:09:26 +0100 Subject: [PATCH 72/77] :memo: added examples for BSON functions --- doc/examples/from_bson.cpp | 21 +++++++++++++++++++++ doc/examples/from_bson.link | 1 + doc/examples/from_bson.output | 4 ++++ doc/examples/to_bson.cpp | 21 +++++++++++++++++++++ doc/examples/to_bson.link | 1 + doc/examples/to_bson.output | 1 + include/nlohmann/json.hpp | 12 ++++++++---- 7 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 doc/examples/from_bson.cpp create mode 100644 doc/examples/from_bson.link create mode 100644 doc/examples/from_bson.output create mode 100644 doc/examples/to_bson.cpp create mode 100644 doc/examples/to_bson.link create mode 100644 doc/examples/to_bson.output diff --git a/doc/examples/from_bson.cpp b/doc/examples/from_bson.cpp new file mode 100644 index 00000000..df71dd37 --- /dev/null +++ b/doc/examples/from_bson.cpp @@ -0,0 +1,21 @@ +#include +#include +#include + +using json = nlohmann::json; + +int main() +{ + // create byte vector + std::vector v = {0x1b, 0x00, 0x00, 0x00, 0x08, 0x63, 0x6f, 0x6d, + 0x70, 0x61, 0x63, 0x74, 0x00, 0x01, 0x10, 0x73, + 0x63, 0x68, 0x65, 0x6d, 0x61, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00 + }; + + // deserialize it with BSON + json j = json::from_bson(v); + + // print the deserialized JSON value + std::cout << std::setw(2) << j << std::endl; +} diff --git a/doc/examples/from_bson.link b/doc/examples/from_bson.link new file mode 100644 index 00000000..59fee158 --- /dev/null +++ b/doc/examples/from_bson.link @@ -0,0 +1 @@ +online \ No newline at end of file diff --git a/doc/examples/from_bson.output b/doc/examples/from_bson.output new file mode 100644 index 00000000..259f63bd --- /dev/null +++ b/doc/examples/from_bson.output @@ -0,0 +1,4 @@ +{ + "compact": true, + "schema": 0 +} diff --git a/doc/examples/to_bson.cpp b/doc/examples/to_bson.cpp new file mode 100644 index 00000000..fd2884f1 --- /dev/null +++ b/doc/examples/to_bson.cpp @@ -0,0 +1,21 @@ +#include +#include +#include + +using json = nlohmann::json; + +int main() +{ + // create a JSON value + json j = R"({"compact": true, "schema": 0})"_json; + + // serialize it to BSON + std::vector v = json::to_bson(j); + + // print the vector content + for (auto& byte : v) + { + std::cout << "0x" << std::hex << std::setw(2) << std::setfill('0') << (int)byte << " "; + } + std::cout << std::endl; +} diff --git a/doc/examples/to_bson.link b/doc/examples/to_bson.link new file mode 100644 index 00000000..c069a220 --- /dev/null +++ b/doc/examples/to_bson.link @@ -0,0 +1 @@ +online \ No newline at end of file diff --git a/doc/examples/to_bson.output b/doc/examples/to_bson.output new file mode 100644 index 00000000..379532a2 --- /dev/null +++ b/doc/examples/to_bson.output @@ -0,0 +1 @@ +0x1b 0x00 0x00 0x00 0x08 0x63 0x6f 0x6d 0x70 0x61 0x63 0x74 0x00 0x01 0x10 0x73 0x63 0x68 0x65 0x6d 0x61 0x00 0x00 0x00 0x00 0x00 0x00 diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index fdd692cb..0ba01de7 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -6672,6 +6672,9 @@ class basic_json @complexity Linear in the size of the JSON value @a j. + @liveexample{The example shows the serialization of a JSON value to a byte + vector in BSON format.,to_bson} + @sa http://bsonspec.org/spec.html @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the analogous deserialization @@ -7020,9 +7023,6 @@ class basic_json return res ? result : basic_json(value_t::discarded); } - - - /*! @brief Create a JSON value from an input in BSON format @@ -7054,7 +7054,6 @@ class basic_json Max Key | 0x7F | still unsupported Min Key | 0xFF | still unsupported - @warning The mapping is **incomplete**. The unsupported mappings are indicated in the table above. @@ -7068,6 +7067,11 @@ class basic_json @throw parse_error.114 if an unsupported BSON record type is encountered + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in + BSON format to a JSON value.,from_bson} + @sa http://bsonspec.org/spec.html @sa @ref to_bson(const basic_json&) for the analogous serialization @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the From 39419cd5c44f010d810676c72b72ceb341f891cf Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 29 Oct 2018 18:51:30 +0100 Subject: [PATCH 73/77] :rotating_light: fixed another linter warning --- test/src/unit-conversions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/src/unit-conversions.cpp b/test/src/unit-conversions.cpp index 266282e9..b07338fe 100644 --- a/test/src/unit-conversions.cpp +++ b/test/src/unit-conversions.cpp @@ -1378,7 +1378,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(cards, {cards::pik, "puk"}, // second entry for cards::puk; will not be used {cards::herz, "herz"}, {cards::karo, "karo"} -}); +}) enum TaskState { @@ -1394,7 +1394,7 @@ NLOHMANN_JSON_SERIALIZE_ENUM(TaskState, {TS_STOPPED, "stopped"}, {TS_RUNNING, "running"}, {TS_COMPLETED, "completed"}, -}); +}) TEST_CASE("JSON to enum mapping") { From 856fc31d0a6eb15c8b8900e84e8f2053feaf7252 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Mon, 29 Oct 2018 19:44:19 +0100 Subject: [PATCH 74/77] :lipstick: fixed indentation --- single_include/nlohmann/json.hpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index d35db62c..6b3d19f0 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -18936,6 +18936,9 @@ class basic_json @complexity Linear in the size of the JSON value @a j. + @liveexample{The example shows the serialization of a JSON value to a byte + vector in BSON format.,to_bson} + @sa http://bsonspec.org/spec.html @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the analogous deserialization @@ -19284,9 +19287,6 @@ class basic_json return res ? result : basic_json(value_t::discarded); } - - - /*! @brief Create a JSON value from an input in BSON format @@ -19318,7 +19318,6 @@ class basic_json Max Key | 0x7F | still unsupported Min Key | 0xFF | still unsupported - @warning The mapping is **incomplete**. The unsupported mappings are indicated in the table above. @@ -19332,6 +19331,11 @@ class basic_json @throw parse_error.114 if an unsupported BSON record type is encountered + @complexity Linear in the size of the input @a i. + + @liveexample{The example shows the deserialization of a byte vector in + BSON format to a JSON value.,from_bson} + @sa http://bsonspec.org/spec.html @sa @ref to_bson(const basic_json&) for the analogous serialization @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the From 8cee0e38d9b8e619b26319a4df83013eb996fe1f Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 30 Oct 2018 17:29:05 +0100 Subject: [PATCH 75/77] :ambulance: fixed #1319 --- include/nlohmann/detail/meta/type_traits.hpp | 13 ++++--------- single_include/nlohmann/json.hpp | 13 ++++--------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index 801df342..d901f1e0 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -191,15 +191,10 @@ struct is_constructible_object_type_impl < using object_t = typename BasicJsonType::object_t; static constexpr bool value = - std::is_constructible::value and - (std::is_same::value or - (has_from_json::value or - has_non_default_from_json < - BasicJsonType, - typename ConstructibleObjectType::mapped_type >::value)); + (std::is_constructible::value and + std::is_same::value) or + (has_from_json::value or + has_non_default_from_json::value); }; template diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 6b3d19f0..87e8eae2 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -582,15 +582,10 @@ struct is_constructible_object_type_impl < using object_t = typename BasicJsonType::object_t; static constexpr bool value = - std::is_constructible::value and - (std::is_same::value or - (has_from_json::value or - has_non_default_from_json < - BasicJsonType, - typename ConstructibleObjectType::mapped_type >::value)); + (std::is_constructible::value and + std::is_same::value) or + (has_from_json::value or + has_non_default_from_json::value); }; template From 7b2f8cce0322bea2d8112635e15c63742ed92e2f Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 30 Oct 2018 21:30:20 +0100 Subject: [PATCH 76/77] :bookmark: set version to 3.4.0 --- CMakeLists.txt | 2 +- ChangeLog.md | 52 ++++++++++++++++++++++++- doc/Doxyfile | 2 +- doc/examples/README.link | 2 +- doc/examples/meta.output | 4 +- doc/index.md | 2 +- doc/json.gif | Bin 1637497 -> 1639232 bytes include/nlohmann/json.hpp | 6 +-- meson.build | 2 +- single_include/nlohmann/json.hpp | 6 +-- test/src/fuzzer-driver_afl.cpp | 2 +- test/src/fuzzer-parse_bson.cpp | 2 +- test/src/fuzzer-parse_cbor.cpp | 2 +- test/src/fuzzer-parse_json.cpp | 2 +- test/src/fuzzer-parse_msgpack.cpp | 2 +- test/src/fuzzer-parse_ubjson.cpp | 2 +- test/src/unit-algorithms.cpp | 2 +- test/src/unit-allocator.cpp | 2 +- test/src/unit-alt-string.cpp | 2 +- test/src/unit-bson.cpp | 2 +- test/src/unit-capacity.cpp | 2 +- test/src/unit-cbor.cpp | 2 +- test/src/unit-class_const_iterator.cpp | 2 +- test/src/unit-class_iterator.cpp | 2 +- test/src/unit-class_lexer.cpp | 2 +- test/src/unit-class_parser.cpp | 2 +- test/src/unit-comparison.cpp | 2 +- test/src/unit-concepts.cpp | 2 +- test/src/unit-constructor1.cpp | 2 +- test/src/unit-constructor2.cpp | 2 +- test/src/unit-convenience.cpp | 2 +- test/src/unit-conversions.cpp | 2 +- test/src/unit-deserialization.cpp | 2 +- test/src/unit-element_access1.cpp | 2 +- test/src/unit-element_access2.cpp | 2 +- test/src/unit-inspection.cpp | 2 +- test/src/unit-items.cpp | 2 +- test/src/unit-iterators1.cpp | 2 +- test/src/unit-iterators2.cpp | 2 +- test/src/unit-json_patch.cpp | 2 +- test/src/unit-json_pointer.cpp | 2 +- test/src/unit-merge_patch.cpp | 2 +- test/src/unit-meta.cpp | 6 +-- test/src/unit-modifiers.cpp | 2 +- test/src/unit-msgpack.cpp | 2 +- test/src/unit-noexcept.cpp | 2 +- test/src/unit-pointer_access.cpp | 2 +- test/src/unit-readme.cpp | 2 +- test/src/unit-reference_access.cpp | 2 +- test/src/unit-regression.cpp | 2 +- test/src/unit-serialization.cpp | 2 +- test/src/unit-testsuites.cpp | 2 +- test/src/unit-to_chars.cpp | 2 +- test/src/unit-ubjson.cpp | 2 +- test/src/unit-udt.cpp | 2 +- test/src/unit-unicode.cpp | 2 +- test/src/unit-wstring.cpp | 2 +- test/src/unit.cpp | 2 +- 58 files changed, 114 insertions(+), 64 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e80d7a98..230cbff8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.8) ## PROJECT ## name and version ## -project(nlohmann_json VERSION 3.3.0 LANGUAGES CXX) +project(nlohmann_json VERSION 3.4.0 LANGUAGES CXX) ## ## INCLUDE diff --git a/ChangeLog.md b/ChangeLog.md index 19b69d2a..9ea08853 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,56 @@ # Change Log All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [v3.4.0](https://github.com/nlohmann/json/releases/tag/v3.4.0) (2018-10-30) +[Full Changelog](https://github.com/nlohmann/json/compare/v3.3.0...v3.4.0) + +- Big uint64\_t values are serialized wrong [\#1327](https://github.com/nlohmann/json/issues/1327) +- \[Question\] Efficient check for equivalency? [\#1325](https://github.com/nlohmann/json/issues/1325) +- Can't use ifstream and .clear\(\) [\#1321](https://github.com/nlohmann/json/issues/1321) +- \[Warning\] -Wparentheses on line 555 on single\_include [\#1319](https://github.com/nlohmann/json/issues/1319) +- Compilation error using at and find with enum struct [\#1316](https://github.com/nlohmann/json/issues/1316) +- Parsing JSON from a web address [\#1311](https://github.com/nlohmann/json/issues/1311) +- How to convert JSON to Struct with embeded subject [\#1310](https://github.com/nlohmann/json/issues/1310) +- Null safety/coalescing function? [\#1309](https://github.com/nlohmann/json/issues/1309) +- Building fails using single include file: json.hpp [\#1308](https://github.com/nlohmann/json/issues/1308) +- json::parse\(std::string\) Exception inside packaged Lib [\#1306](https://github.com/nlohmann/json/issues/1306) +- Problem in Dockerfile with installation of library [\#1304](https://github.com/nlohmann/json/issues/1304) +- compile error in from\_json converting to container with std::pair [\#1299](https://github.com/nlohmann/json/issues/1299) +- Json that I am trying to parse, and I am lost Structure Array below top level [\#1293](https://github.com/nlohmann/json/issues/1293) +- Serializing std::variant causes stack overflow [\#1292](https://github.com/nlohmann/json/issues/1292) +- How do I go about customising from\_json to support \_\_int128\_t/\_\_uint128\_t? [\#1290](https://github.com/nlohmann/json/issues/1290) +- merge\_patch: inconsistent behaviour merging empty sub-object [\#1289](https://github.com/nlohmann/json/issues/1289) +- Buffer over/underrun using UBJson? [\#1288](https://github.com/nlohmann/json/issues/1288) +- Enable the latest C++ standard with Visual Studio [\#1287](https://github.com/nlohmann/json/issues/1287) +- truncation of constant value in to\_cbor\(\) [\#1286](https://github.com/nlohmann/json/issues/1286) +- eosio.wasmsdk error [\#1284](https://github.com/nlohmann/json/issues/1284) +- use the same interface for writing arrays and non-arrays [\#1283](https://github.com/nlohmann/json/issues/1283) +- How to read json file with optional entries and entries with different types [\#1281](https://github.com/nlohmann/json/issues/1281) +- merge result not as espected [\#1279](https://github.com/nlohmann/json/issues/1279) +- how to get only "name" from below json [\#1278](https://github.com/nlohmann/json/issues/1278) +- syntax error on right json string [\#1276](https://github.com/nlohmann/json/issues/1276) +- Parsing JSON Array where members have no key, using custom types [\#1267](https://github.com/nlohmann/json/issues/1267) +- I get a json exception periodically from json::parse for the same json [\#1263](https://github.com/nlohmann/json/issues/1263) +- serialize std::variant\<...\> [\#1261](https://github.com/nlohmann/json/issues/1261) +- GCC 8.2.1. Compilation error: invalid conversion from... [\#1246](https://github.com/nlohmann/json/issues/1246) +- BSON support [\#1244](https://github.com/nlohmann/json/issues/1244) +- enum to json mapping [\#1208](https://github.com/nlohmann/json/issues/1208) +- Soften the landing when dumping non-UTF8 strings \(type\_error.316 exception\) [\#1198](https://github.com/nlohmann/json/issues/1198) +- CMakeLists.txt in release zips? [\#1184](https://github.com/nlohmann/json/issues/1184) +- CBOR byte string support [\#1129](https://github.com/nlohmann/json/issues/1129) + +- Add macro to define enum/JSON mapping [\#1323](https://github.com/nlohmann/json/pull/1323) ([nlohmann](https://github.com/nlohmann)) +- Add BSON support [\#1320](https://github.com/nlohmann/json/pull/1320) ([nlohmann](https://github.com/nlohmann)) +- Properly convert constants to CharType [\#1315](https://github.com/nlohmann/json/pull/1315) ([nlohmann](https://github.com/nlohmann)) +- Allow to set error handler for decoding errors [\#1314](https://github.com/nlohmann/json/pull/1314) ([nlohmann](https://github.com/nlohmann)) +- Add Meson related info to README [\#1305](https://github.com/nlohmann/json/pull/1305) ([koponomarenko](https://github.com/koponomarenko)) +- Improve diagnostic messages for binary formats [\#1303](https://github.com/nlohmann/json/pull/1303) ([nlohmann](https://github.com/nlohmann)) +- add new is\_constructible\_\* traits used in from\_json [\#1301](https://github.com/nlohmann/json/pull/1301) ([theodelrieu](https://github.com/theodelrieu)) +- add constraints for variadic json\_ref constructors [\#1294](https://github.com/nlohmann/json/pull/1294) ([theodelrieu](https://github.com/theodelrieu)) +- Improve diagnostic messages [\#1282](https://github.com/nlohmann/json/pull/1282) ([nlohmann](https://github.com/nlohmann)) +- Removed linter warnings [\#1280](https://github.com/nlohmann/json/pull/1280) ([nlohmann](https://github.com/nlohmann)) +- Thirdparty benchmark: Fix Clang detection. [\#1277](https://github.com/nlohmann/json/pull/1277) ([Lord-Kamina](https://github.com/Lord-Kamina)) + ## [v3.3.0](https://github.com/nlohmann/json/releases/tag/v3.3.0) (2018-10-05) [Full Changelog](https://github.com/nlohmann/json/compare/v3.2.0...v3.3.0) @@ -9,6 +59,7 @@ All notable changes to this project will be documented in this file. This projec - how can we get this working on WSL? [\#1264](https://github.com/nlohmann/json/issues/1264) - Help needed [\#1259](https://github.com/nlohmann/json/issues/1259) - A way to get to a JSON values "key" [\#1258](https://github.com/nlohmann/json/issues/1258) +- While compiling got 76 errors [\#1255](https://github.com/nlohmann/json/issues/1255) - Two blackslashes on json output file [\#1253](https://github.com/nlohmann/json/issues/1253) - Including nlohmann the badwrong way. [\#1250](https://github.com/nlohmann/json/issues/1250) - how to build with clang? [\#1247](https://github.com/nlohmann/json/issues/1247) @@ -42,7 +93,6 @@ All notable changes to this project will be documented in this file. This projec - Returning empty json object from a function of type const json& ? [\#1205](https://github.com/nlohmann/json/issues/1205) - VS2017 compiler suggests using constexpr if [\#1204](https://github.com/nlohmann/json/issues/1204) - Template instatiation error on compiling [\#1203](https://github.com/nlohmann/json/issues/1203) -- Soften the landing when dumping non-UTF8 strings \(type\_error.316 exception\) [\#1198](https://github.com/nlohmann/json/issues/1198) - BUG - json dump field with unicode -\> array of ints \(instead of string\) [\#1197](https://github.com/nlohmann/json/issues/1197) - Compile error using Code::Blocks // mingw-w64 GCC 8.1.0 - "Incomplete Type" [\#1193](https://github.com/nlohmann/json/issues/1193) - SEGFAULT on arm target [\#1190](https://github.com/nlohmann/json/issues/1190) diff --git a/doc/Doxyfile b/doc/Doxyfile index 87d234ff..f86b70a2 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "JSON for Modern C++" -PROJECT_NUMBER = 3.3.0 +PROJECT_NUMBER = 3.4.0 PROJECT_BRIEF = PROJECT_LOGO = OUTPUT_DIRECTORY = . diff --git a/doc/examples/README.link b/doc/examples/README.link index 5b620f23..006b7adf 100644 --- a/doc/examples/README.link +++ b/doc/examples/README.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/meta.output b/doc/examples/meta.output index a21937f2..cab02d7e 100644 --- a/doc/examples/meta.output +++ b/doc/examples/meta.output @@ -10,8 +10,8 @@ "url": "https://github.com/nlohmann/json", "version": { "major": 3, - "minor": 3, + "minor": 4, "patch": 0, - "string": "3.3.0" + "string": "3.4.0" } } diff --git a/doc/index.md b/doc/index.md index 53faa347..da6a97d3 100644 --- a/doc/index.md +++ b/doc/index.md @@ -306,4 +306,4 @@ Note that this table only lists those exceptions thrown due to the type. For ins @author [Niels Lohmann](http://nlohmann.me) @see https://github.com/nlohmann/json to download the source code -@version 3.3.0 +@version 3.4.0 diff --git a/doc/json.gif b/doc/json.gif index 03cb06eb217b39880abdc303275de3bd2d9df2c1..5fb91d587d8815047eef5a8463e5d0b604840bdb 100644 GIT binary patch delta 163726 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 z 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 SQpFC2_`#64eIiv-n)*K`VS*C? delta 162308 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 F_&+=q0q_6- diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 0ba01de7..30e69895 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . @@ -31,7 +31,7 @@ SOFTWARE. #define NLOHMANN_JSON_HPP #define NLOHMANN_JSON_VERSION_MAJOR 3 -#define NLOHMANN_JSON_VERSION_MINOR 3 +#define NLOHMANN_JSON_VERSION_MINOR 4 #define NLOHMANN_JSON_VERSION_PATCH 0 #include // all_of, find, for_each @@ -949,7 +949,7 @@ class basic_json object = nullptr; // silence warning, see #821 if (JSON_UNLIKELY(t == value_t::null)) { - JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.3.0")); // LCOV_EXCL_LINE + JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.4.0")); // LCOV_EXCL_LINE } break; } diff --git a/meson.build b/meson.build index 6935567b..f0271cc3 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('nlohmann_json', 'cpp', - version : '3.3.0', + version : '3.4.0', license : 'MIT', ) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 87e8eae2..1e7cf51e 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . @@ -31,7 +31,7 @@ SOFTWARE. #define NLOHMANN_JSON_HPP #define NLOHMANN_JSON_VERSION_MAJOR 3 -#define NLOHMANN_JSON_VERSION_MINOR 3 +#define NLOHMANN_JSON_VERSION_MINOR 4 #define NLOHMANN_JSON_VERSION_PATCH 0 #include // all_of, find, for_each @@ -13208,7 +13208,7 @@ class basic_json object = nullptr; // silence warning, see #821 if (JSON_UNLIKELY(t == value_t::null)) { - JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.3.0")); // LCOV_EXCL_LINE + JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.4.0")); // LCOV_EXCL_LINE } break; } diff --git a/test/src/fuzzer-driver_afl.cpp b/test/src/fuzzer-driver_afl.cpp index 6c23f830..dbefb448 100644 --- a/test/src/fuzzer-driver_afl.cpp +++ b/test/src/fuzzer-driver_afl.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a driver for American Fuzzy Lop (afl-fuzz). It relies on diff --git a/test/src/fuzzer-parse_bson.cpp b/test/src/fuzzer-parse_bson.cpp index 86b9f176..901fa723 100644 --- a/test/src/fuzzer-parse_bson.cpp +++ b/test/src/fuzzer-parse_bson.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/fuzzer-parse_cbor.cpp b/test/src/fuzzer-parse_cbor.cpp index 6dd310b0..f1c86d82 100644 --- a/test/src/fuzzer-parse_cbor.cpp +++ b/test/src/fuzzer-parse_cbor.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/fuzzer-parse_json.cpp b/test/src/fuzzer-parse_json.cpp index 7aa3dc21..1c3804cd 100644 --- a/test/src/fuzzer-parse_json.cpp +++ b/test/src/fuzzer-parse_json.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/fuzzer-parse_msgpack.cpp b/test/src/fuzzer-parse_msgpack.cpp index 2ddf21ee..a1c31470 100644 --- a/test/src/fuzzer-parse_msgpack.cpp +++ b/test/src/fuzzer-parse_msgpack.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/fuzzer-parse_ubjson.cpp b/test/src/fuzzer-parse_ubjson.cpp index a573e300..704a1de0 100644 --- a/test/src/fuzzer-parse_ubjson.cpp +++ b/test/src/fuzzer-parse_ubjson.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/unit-algorithms.cpp b/test/src/unit-algorithms.cpp index 59eb3de7..91af7419 100644 --- a/test/src/unit-algorithms.cpp +++ b/test/src/unit-algorithms.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-allocator.cpp b/test/src/unit-allocator.cpp index 20708a4c..d7779c06 100644 --- a/test/src/unit-allocator.cpp +++ b/test/src/unit-allocator.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-alt-string.cpp b/test/src/unit-alt-string.cpp index 99d85678..bae19cdb 100644 --- a/test/src/unit-alt-string.cpp +++ b/test/src/unit-alt-string.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-bson.cpp b/test/src/unit-bson.cpp index 36dacb46..406f0800 100644 --- a/test/src/unit-bson.cpp +++ b/test/src/unit-bson.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.2.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-capacity.cpp b/test/src/unit-capacity.cpp index cd4f9538..cc2b0c0d 100644 --- a/test/src/unit-capacity.cpp +++ b/test/src/unit-capacity.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp index d7f52ed8..0ea9812c 100644 --- a/test/src/unit-cbor.cpp +++ b/test/src/unit-cbor.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-class_const_iterator.cpp b/test/src/unit-class_const_iterator.cpp index ea039cdc..20c4e540 100644 --- a/test/src/unit-class_const_iterator.cpp +++ b/test/src/unit-class_const_iterator.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-class_iterator.cpp b/test/src/unit-class_iterator.cpp index 459e0e1e..a45659a3 100644 --- a/test/src/unit-class_iterator.cpp +++ b/test/src/unit-class_iterator.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-class_lexer.cpp b/test/src/unit-class_lexer.cpp index 01aee242..10798e10 100644 --- a/test/src/unit-class_lexer.cpp +++ b/test/src/unit-class_lexer.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-class_parser.cpp b/test/src/unit-class_parser.cpp index 8d0b68d2..c40dc613 100644 --- a/test/src/unit-class_parser.cpp +++ b/test/src/unit-class_parser.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-comparison.cpp b/test/src/unit-comparison.cpp index 91c47453..b99aee95 100644 --- a/test/src/unit-comparison.cpp +++ b/test/src/unit-comparison.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-concepts.cpp b/test/src/unit-concepts.cpp index 8ceb485b..56f8a35d 100644 --- a/test/src/unit-concepts.cpp +++ b/test/src/unit-concepts.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-constructor1.cpp b/test/src/unit-constructor1.cpp index e5a1eb44..15fc7f82 100644 --- a/test/src/unit-constructor1.cpp +++ b/test/src/unit-constructor1.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-constructor2.cpp b/test/src/unit-constructor2.cpp index 4f5e11d3..222bec27 100644 --- a/test/src/unit-constructor2.cpp +++ b/test/src/unit-constructor2.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-convenience.cpp b/test/src/unit-convenience.cpp index bbb259b6..a8037c37 100644 --- a/test/src/unit-convenience.cpp +++ b/test/src/unit-convenience.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-conversions.cpp b/test/src/unit-conversions.cpp index b07338fe..fbdc5329 100644 --- a/test/src/unit-conversions.cpp +++ b/test/src/unit-conversions.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-deserialization.cpp b/test/src/unit-deserialization.cpp index 8610cebd..09896800 100644 --- a/test/src/unit-deserialization.cpp +++ b/test/src/unit-deserialization.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-element_access1.cpp b/test/src/unit-element_access1.cpp index 96ee58b2..2903182e 100644 --- a/test/src/unit-element_access1.cpp +++ b/test/src/unit-element_access1.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-element_access2.cpp b/test/src/unit-element_access2.cpp index c629a9ac..563afcef 100644 --- a/test/src/unit-element_access2.cpp +++ b/test/src/unit-element_access2.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-inspection.cpp b/test/src/unit-inspection.cpp index 007b304d..5bc08fa7 100644 --- a/test/src/unit-inspection.cpp +++ b/test/src/unit-inspection.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-items.cpp b/test/src/unit-items.cpp index 6c716eeb..bfa3f9e4 100644 --- a/test/src/unit-items.cpp +++ b/test/src/unit-items.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-iterators1.cpp b/test/src/unit-iterators1.cpp index c911ce92..716cff11 100644 --- a/test/src/unit-iterators1.cpp +++ b/test/src/unit-iterators1.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-iterators2.cpp b/test/src/unit-iterators2.cpp index 2369cc47..8ca266f9 100644 --- a/test/src/unit-iterators2.cpp +++ b/test/src/unit-iterators2.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-json_patch.cpp b/test/src/unit-json_patch.cpp index 55f2eb7d..605e36f1 100644 --- a/test/src/unit-json_patch.cpp +++ b/test/src/unit-json_patch.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-json_pointer.cpp b/test/src/unit-json_pointer.cpp index 7f5605d9..bf1f3c85 100644 --- a/test/src/unit-json_pointer.cpp +++ b/test/src/unit-json_pointer.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-merge_patch.cpp b/test/src/unit-merge_patch.cpp index 417e1dd4..9225bd80 100644 --- a/test/src/unit-merge_patch.cpp +++ b/test/src/unit-merge_patch.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-meta.cpp b/test/src/unit-meta.cpp index 36d31909..b711a606 100644 --- a/test/src/unit-meta.cpp +++ b/test/src/unit-meta.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . @@ -43,9 +43,9 @@ TEST_CASE("version information") CHECK(j["url"] == "https://github.com/nlohmann/json"); CHECK(j["version"] == json( { - {"string", "3.3.0"}, + {"string", "3.4.0"}, {"major", 3}, - {"minor", 3}, + {"minor", 4}, {"patch", 0} })); diff --git a/test/src/unit-modifiers.cpp b/test/src/unit-modifiers.cpp index 5548db12..2f901b24 100644 --- a/test/src/unit-modifiers.cpp +++ b/test/src/unit-modifiers.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-msgpack.cpp b/test/src/unit-msgpack.cpp index 26d07963..c082e20c 100644 --- a/test/src/unit-msgpack.cpp +++ b/test/src/unit-msgpack.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-noexcept.cpp b/test/src/unit-noexcept.cpp index b7df80c8..8857b99d 100644 --- a/test/src/unit-noexcept.cpp +++ b/test/src/unit-noexcept.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-pointer_access.cpp b/test/src/unit-pointer_access.cpp index 5dff33a6..bc9b353d 100644 --- a/test/src/unit-pointer_access.cpp +++ b/test/src/unit-pointer_access.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-readme.cpp b/test/src/unit-readme.cpp index d9afa1d7..fe284294 100644 --- a/test/src/unit-readme.cpp +++ b/test/src/unit-readme.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-reference_access.cpp b/test/src/unit-reference_access.cpp index 3288a14e..e8d20e83 100644 --- a/test/src/unit-reference_access.cpp +++ b/test/src/unit-reference_access.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index c7736b71..5f007980 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-serialization.cpp b/test/src/unit-serialization.cpp index 1fe796e5..814aa18d 100644 --- a/test/src/unit-serialization.cpp +++ b/test/src/unit-serialization.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-testsuites.cpp b/test/src/unit-testsuites.cpp index caa6ee3e..3c00fada 100644 --- a/test/src/unit-testsuites.cpp +++ b/test/src/unit-testsuites.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-to_chars.cpp b/test/src/unit-to_chars.cpp index f6016a6c..08dbd0d2 100644 --- a/test/src/unit-to_chars.cpp +++ b/test/src/unit-to_chars.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-ubjson.cpp b/test/src/unit-ubjson.cpp index ba0d23da..20f84cd5 100644 --- a/test/src/unit-ubjson.cpp +++ b/test/src/unit-ubjson.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-udt.cpp b/test/src/unit-udt.cpp index fbcf027d..c2b8a2d7 100644 --- a/test/src/unit-udt.cpp +++ b/test/src/unit-udt.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index a8a0a938..e3a0728b 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit-wstring.cpp b/test/src/unit-wstring.cpp index 9f59b9d0..540b379f 100644 --- a/test/src/unit-wstring.cpp +++ b/test/src/unit-wstring.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . diff --git a/test/src/unit.cpp b/test/src/unit.cpp index 1852b993..b99defb0 100644 --- a/test/src/unit.cpp +++ b/test/src/unit.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.3.0 +| | |__ | | | | | | version 3.4.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . From 0f3c74d8218f784c3f779fc475dd0dabca1bd6b7 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 30 Oct 2018 22:18:45 +0100 Subject: [PATCH 77/77] :bookmark: set version to 3.4.0 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8220bd3c..1154a62e 100644 --- a/README.md +++ b/README.md @@ -308,9 +308,9 @@ std::cout << cpp_string << " == " << cpp_string2 << " == " << cpp_string3 << " = std::cout << j_string << " == " << serialized_string << std::endl; ``` -[`.dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5adea76fedba9898d404fef8598aa663.html#a5adea76fedba9898d404fef8598aa663) always returns the serialized value, and [`.get()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a16f9445f7629f634221a42b967cdcd43.html#a16f9445f7629f634221a42b967cdcd43) returns the originally stored string value. +[`.dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a50ec80b02d0f3f51130d4abb5d1cfdc5.html#a50ec80b02d0f3f51130d4abb5d1cfdc5) always returns the serialized value, and [`.get()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a16f9445f7629f634221a42b967cdcd43.html#a16f9445f7629f634221a42b967cdcd43) returns the originally stored string value. -Note the library only supports UTF-8. When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a5adea76fedba9898d404fef8598aa663.html#a5adea76fedba9898d404fef8598aa663) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers. +Note the library only supports UTF-8. When you store strings with different encodings in the library, calling [`dump()`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a50ec80b02d0f3f51130d4abb5d1cfdc5.html#a50ec80b02d0f3f51130d4abb5d1cfdc5) may throw an exception unless `json::error_handler_t::replace` or `json::error_handler_t::ignore` are used as error handlers. #### To/from streams (e.g. files, string streams)