mirror of
https://github.com/nlohmann/json.git
synced 2026-11-17 09:01:28 +00:00
Report the same error position for bulk number runs as for byte-wise input
For contiguous input, the CBOR and MessagePack readers read the scalars of an array in one loop, and the UBJSON/BJData readers the numbers of an optimized array. These loops passed a value on before they advanced the position and the last byte. With a number_float_t narrower than the value (for example float), passing the value on reports out_of_range.406, and SAX parse_error() then got a different position and last token than for the same bytes read through a non-contiguous adapter. Advance before passing the value on in the CBOR and MessagePack loops. The last byte is the head byte, as get_number() does not change it; the MessagePack loop used the last byte of the value. In the typed UBJSON/BJData loop, update the position per value only where passing it on can report an error, which is decided at compile time and never the case for the default number types, and do not change the last byte, as reading the values one by one does not. Instruction counts of SAX and DOM parsing of arrays of one million numbers: CBOR -1 to -4 %, MessagePack -2 to -10 %, UBJSON/BJData typed arrays -0.8 to +0.6 % (clang, -O2). Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
3 files changed
+267
-86
No files matched your search
@@ -14,6 +14,7 @@ using nlohmann::json;
|
||||
#include <cmath>
|
||||
#include <fstream>
|
||||
#include <limits>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -367,3 +368,125 @@ TEST_CASE("Binary formats with narrow number types")
|
||||
CHECK(format.decode(format.encode(json(1e300)), false).is_discarded());
|
||||
}
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
// records the SAX events of narrow_json, including the arguments of parse_error
|
||||
struct narrow_event_recorder
|
||||
{
|
||||
using number_integer_t = narrow_json::number_integer_t;
|
||||
using number_unsigned_t = narrow_json::number_unsigned_t;
|
||||
using number_float_t = narrow_json::number_float_t;
|
||||
using string_t = narrow_json::string_t;
|
||||
using binary_t = narrow_json::binary_t;
|
||||
|
||||
bool null()
|
||||
{
|
||||
events.emplace_back("null");
|
||||
return true;
|
||||
}
|
||||
bool boolean(bool val)
|
||||
{
|
||||
events.emplace_back(val ? "true" : "false");
|
||||
return true;
|
||||
}
|
||||
bool number_integer(number_integer_t val)
|
||||
{
|
||||
events.push_back(std::to_string(val));
|
||||
return true;
|
||||
}
|
||||
bool number_unsigned(number_unsigned_t val)
|
||||
{
|
||||
events.push_back(std::to_string(val));
|
||||
return true;
|
||||
}
|
||||
bool number_float(number_float_t val, const string_t& /*unused*/)
|
||||
{
|
||||
events.push_back(std::to_string(val));
|
||||
return true;
|
||||
}
|
||||
bool string(string_t& val)
|
||||
{
|
||||
events.push_back(val);
|
||||
return true;
|
||||
}
|
||||
bool binary(binary_t& /*unused*/)
|
||||
{
|
||||
events.emplace_back("binary");
|
||||
return true;
|
||||
}
|
||||
bool start_object(std::size_t /*unused*/)
|
||||
{
|
||||
events.emplace_back("{");
|
||||
return true;
|
||||
}
|
||||
bool key(string_t& val)
|
||||
{
|
||||
events.push_back(val);
|
||||
return true;
|
||||
}
|
||||
bool end_object()
|
||||
{
|
||||
events.emplace_back("}");
|
||||
return true;
|
||||
}
|
||||
bool start_array(std::size_t /*unused*/)
|
||||
{
|
||||
events.emplace_back("[");
|
||||
return true;
|
||||
}
|
||||
bool end_array()
|
||||
{
|
||||
events.emplace_back("]");
|
||||
return true;
|
||||
}
|
||||
bool parse_error(std::size_t position, const std::string& last_token, const nlohmann::detail::exception& ex)
|
||||
{
|
||||
events.push_back("parse_error(" + std::to_string(position) + ", " + last_token + ", " + ex.what() + ")");
|
||||
return false;
|
||||
}
|
||||
|
||||
std::vector<std::string> events {}; // NOLINT(readability-redundant-member-init)
|
||||
};
|
||||
} // namespace
|
||||
|
||||
TEST_CASE("Binary formats with narrow number types from contiguous and non-contiguous input")
|
||||
{
|
||||
// contiguous input reads runs of numbers in one loop; a number that
|
||||
// overflows number_float_t must be reported with the same position and
|
||||
// last byte as when the input is read byte by byte
|
||||
const json values = {1, 70000, -70000, 1.5, 2.5, 1e300, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5};
|
||||
const json doubles = {1.5, 2.5, 3.5, 1e300, 4.5, 5.5, 6.5, 7.5, 8.5};
|
||||
|
||||
struct binary_input
|
||||
{
|
||||
const char* name;
|
||||
json::input_format_t format;
|
||||
bytes data;
|
||||
};
|
||||
const std::vector<binary_input> inputs =
|
||||
{
|
||||
{"CBOR", json::input_format_t::cbor, json::to_cbor(values)},
|
||||
{"CBOR doubles", json::input_format_t::cbor, json::to_cbor(doubles)},
|
||||
{"MessagePack", json::input_format_t::msgpack, json::to_msgpack(values)},
|
||||
{"MessagePack doubles", json::input_format_t::msgpack, json::to_msgpack(doubles)},
|
||||
{"UBJSON", json::input_format_t::ubjson, json::to_ubjson(values, true)},
|
||||
{"UBJSON typed doubles", json::input_format_t::ubjson, json::to_ubjson(doubles, true, true)},
|
||||
{"BJData", json::input_format_t::bjdata, json::to_bjdata(values, true)},
|
||||
{"BJData typed doubles", json::input_format_t::bjdata, json::to_bjdata(doubles, true, true)},
|
||||
};
|
||||
|
||||
for (const auto& input : inputs)
|
||||
{
|
||||
const std::string name = input.name;
|
||||
CAPTURE(name)
|
||||
const std::list<std::uint8_t> bytewise(input.data.begin(), input.data.end());
|
||||
narrow_event_recorder from_contiguous;
|
||||
narrow_event_recorder from_bytewise;
|
||||
CHECK_FALSE(narrow_json::sax_parse(input.data, &from_contiguous, input.format));
|
||||
CHECK_FALSE(narrow_json::sax_parse(bytewise.begin(), bytewise.end(), &from_bytewise, input.format));
|
||||
CHECK(from_contiguous.events == from_bytewise.events);
|
||||
REQUIRE(!from_contiguous.events.empty());
|
||||
CHECK(from_contiguous.events.back().find("out_of_range.406") != std::string::npos);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user