mirror of
https://github.com/nlohmann/json.git
synced 2026-11-17 09:01:28 +00:00
Write a binary subtype independently of number_unsigned_t in dump()
The subtype of a binary value is a std::uint64_t, but dump() wrote it with dump_integer, which converts its argument to the magnitude type of number_unsigned_t. With a number_unsigned_t narrower than 64 bits, the subtype was truncated (subtype 300 with std::uint8_t numbers was printed as 44). A dump_subtype helper now writes the subtype for both the compact and the pretty-printed output: through dump_integer if the magnitude type of number_unsigned_t has at least 64 bits (the default json, so its output and speed are unchanged), and with a digit loop otherwise. Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
3 files changed
+104
-4
No files matched your search
@@ -636,7 +636,7 @@ class serializer
|
||||
put_literal("\"subtype\": ");
|
||||
if (binary.has_subtype())
|
||||
{
|
||||
dump_integer(binary.subtype());
|
||||
dump_subtype(binary.subtype());
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -662,7 +662,7 @@ class serializer
|
||||
put_literal("],\"subtype\":");
|
||||
if (binary.has_subtype())
|
||||
{
|
||||
dump_integer(binary.subtype());
|
||||
dump_subtype(binary.subtype());
|
||||
put_char('}');
|
||||
}
|
||||
else
|
||||
@@ -1883,6 +1883,40 @@ class serializer
|
||||
write_buffer_pos = pos;
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief dump the subtype of a binary value
|
||||
|
||||
The subtype is a std::uint64_t, whatever the number types are. @ref
|
||||
dump_integer converts its argument to the magnitude type of
|
||||
number_unsigned_t, so it writes the subtype only if that type has at least
|
||||
64 bits; otherwise (it would truncate the subtype) the digits are written
|
||||
one by one.
|
||||
|
||||
@param[in] subtype the subtype to dump
|
||||
*/
|
||||
void dump_subtype(std::uint64_t subtype)
|
||||
{
|
||||
dump_subtype(subtype, std::integral_constant<bool, magnitude_has_at_least_64_bits> {});
|
||||
}
|
||||
|
||||
void dump_subtype(std::uint64_t subtype, std::true_type /*magnitude has at least 64 bits*/)
|
||||
{
|
||||
dump_integer(subtype);
|
||||
}
|
||||
|
||||
void dump_subtype(std::uint64_t subtype, std::false_type /*magnitude has less than 64 bits*/)
|
||||
{
|
||||
std::array<char, 20> digits{{}}; // 2^64 - 1 has 20 digits
|
||||
std::size_t start = digits.size();
|
||||
do
|
||||
{
|
||||
digits[--start] = static_cast<char>('0' + (subtype % 10));
|
||||
subtype /= 10;
|
||||
}
|
||||
while (subtype != 0);
|
||||
put_string(digits, start, digits.size());
|
||||
}
|
||||
|
||||
/*!
|
||||
@brief dump an integer
|
||||
|
||||
@@ -2136,6 +2170,11 @@ class serializer
|
||||
static constexpr bool magnitude_has_at_most_64_bits = std::numeric_limits<number_magnitude_t>::is_specialized
|
||||
&& std::numeric_limits<number_magnitude_t>::digits <= 64;
|
||||
|
||||
/// whether every std::uint64_t fits number_magnitude_t (then dump_integer
|
||||
/// can write a binary subtype)
|
||||
static constexpr bool magnitude_has_at_least_64_bits = std::numeric_limits<number_magnitude_t>::is_specialized
|
||||
&& std::numeric_limits<number_magnitude_t>::digits >= 64;
|
||||
|
||||
/// whether @a x fits 64 bits: always if number_magnitude_t has at most
|
||||
/// 64 bits (selected by type, as the comparison would be reported as
|
||||
/// always true), else compared
|
||||
|
||||
Reference in new issue
Block a user