lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-08-09 05:22:48 +03:00
Code Activity

🚨 remove warnings

Browse Source
This commit is contained in:
Niels Lohmann
2020-06-22 22:32:21 +02:00
parent 29ad2178c6
commit 8b3d2399a4
10 changed files with 250 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
include/nlohmann/detail/input/binary_reader.hpp
View File

@@ -145,7 +145,7 @@ class binary_reader
*/
bool parse_bson_internal()
{
std::int32_t document_size;
std::int32_t document_size{};
get_number<std::int32_t, true>(input_format_t::bson, document_size);
if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
@@ -184,8 +184,6 @@ class binary_reader
}
*out++ = static_cast<typename string_t::value_type>(current);
}
return true;
}
/*!
@@ -230,7 +228,7 @@ class binary_reader
}
// All BSON binary values have a subtype
std::uint8_t subtype;
std::uint8_t subtype{};
get_number<std::uint8_t>(input_format_t::bson, subtype);
result.set_subtype(subtype);
@@ -254,13 +252,13 @@ class binary_reader
{
case 0x01: // double
{
double number;
double number{};
return get_number<double, true>(input_format_t::bson, number) and sax->number_float(static_cast<number_float_t>(number), "");
}
case 0x02: // string
{
std::int32_t len;
std::int32_t len{};
string_t value;
return get_number<std::int32_t, true>(input_format_t::bson, len) and get_bson_string(len, value) and sax->string(value);
}
@@ -277,7 +275,7 @@ class binary_reader
case 0x05: // binary
{
std::int32_t len;
std::int32_t len{};
binary_t value;
return get_number<std::int32_t, true>(input_format_t::bson, len) and get_bson_binary(len, value) and sax->binary(value);
}
@@ -294,13 +292,13 @@ class binary_reader
case 0x10: // int32
{
std::int32_t value;
std::int32_t value{};
return get_number<std::int32_t, true>(input_format_t::bson, value) and sax->number_integer(value);
}
case 0x12: // int64
{
std::int64_t value;
std::int64_t value{};
return get_number<std::int64_t, true>(input_format_t::bson, value) and sax->number_integer(value);
}
@@ -365,7 +363,7 @@ class binary_reader
*/
bool parse_bson_array()
{
std::int32_t document_size;
std::int32_t document_size{};
get_number<std::int32_t, true>(input_format_t::bson, document_size);
if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
@@ -429,25 +427,25 @@ class binary_reader
case 0x18: // Unsigned integer (one-byte uint8_t follows)
{
std::uint8_t number;
std::uint8_t number{};
return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
}
case 0x19: // Unsigned integer (two-byte uint16_t follows)
{
std::uint16_t number;
std::uint16_t number{};
return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
}
case 0x1A: // Unsigned integer (four-byte uint32_t follows)
{
std::uint32_t number;
std::uint32_t number{};
return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
}
case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
{
std::uint64_t number;
std::uint64_t number{};
return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
}
@@ -480,25 +478,25 @@ class binary_reader
case 0x38: // Negative integer (one-byte uint8_t follows)
{
std::uint8_t number;
std::uint8_t number{};
return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
}
case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
{
std::uint16_t number;
std::uint16_t number{};
return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
}
case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
{
std::uint32_t number;
std::uint32_t number{};
return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
}
case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
{
std::uint64_t number;
std::uint64_t number{};
return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1)
- static_cast<number_integer_t>(number));
}
@@ -602,25 +600,25 @@ class binary_reader
case 0x98: // array (one-byte uint8_t for n follows)
{
std::uint8_t len;
std::uint8_t len{};
return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
}
case 0x99: // array (two-byte uint16_t for n follow)
{
std::uint16_t len;
std::uint16_t len{};
return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
}
case 0x9A: // array (four-byte uint32_t for n follow)
{
std::uint32_t len;
std::uint32_t len{};
return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
}
case 0x9B: // array (eight-byte uint64_t for n follow)
{
std::uint64_t len;
std::uint64_t len{};
return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
}
@@ -656,25 +654,25 @@ class binary_reader
case 0xB8: // map (one-byte uint8_t for n follows)
{
std::uint8_t len;
std::uint8_t len{};
return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
}
case 0xB9: // map (two-byte uint16_t for n follow)
{
std::uint16_t len;
std::uint16_t len{};
return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
}
case 0xBA: // map (four-byte uint32_t for n follow)
{
std::uint32_t len;
std::uint32_t len{};
return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
}
case 0xBB: // map (eight-byte uint64_t for n follow)
{
std::uint64_t len;
std::uint64_t len{};
return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
}
@@ -740,13 +738,13 @@ class binary_reader
case 0xFA: // Single-Precision Float (four-byte IEEE 754)
{
float number;
float number{};
return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
}
case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
{
double number;
double number{};
return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
}
@@ -809,25 +807,25 @@ class binary_reader
case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
{
std::uint8_t len;
std::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)
{
std::uint16_t len;
std::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)
{
std::uint32_t len;
std::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)
{
std::uint64_t len;
std::uint64_t len{};
return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
}
@@ -904,28 +902,28 @@ class binary_reader
case 0x58: // Binary data (one-byte uint8_t for n follows)
{
std::uint8_t len;
std::uint8_t len{};
return get_number(input_format_t::cbor, len) and
get_binary(input_format_t::cbor, len, result);
}
case 0x59: // Binary data (two-byte uint16_t for n follow)
{
std::uint16_t len;
std::uint16_t len{};
return get_number(input_format_t::cbor, len) and
get_binary(input_format_t::cbor, len, result);
}
case 0x5A: // Binary data (four-byte uint32_t for n follow)
{
std::uint32_t len;
std::uint32_t len{};
return get_number(input_format_t::cbor, len) and
get_binary(input_format_t::cbor, len, result);
}
case 0x5B: // Binary data (eight-byte uint64_t for n follow)
{
std::uint64_t len;
std::uint64_t len{};
return get_number(input_format_t::cbor, len) and
get_binary(input_format_t::cbor, len, result);
}
@@ -1290,85 +1288,85 @@ class binary_reader
case 0xCA: // float 32
{
float number;
float number{};
return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
}
case 0xCB: // float 64
{
double number;
double number{};
return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
}
case 0xCC: // uint 8
{
std::uint8_t number;
std::uint8_t number{};
return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
}
case 0xCD: // uint 16
{
std::uint16_t number;
std::uint16_t number{};
return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
}
case 0xCE: // uint 32
{
std::uint32_t number;
std::uint32_t number{};
return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
}
case 0xCF: // uint 64
{
std::uint64_t number;
std::uint64_t number{};
return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
}
case 0xD0: // int 8
{
std::int8_t number;
std::int8_t number{};
return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
}
case 0xD1: // int 16
{
std::int16_t number;
std::int16_t number{};
return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
}
case 0xD2: // int 32
{
std::int32_t number;
std::int32_t number{};
return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
}
case 0xD3: // int 64
{
std::int64_t number;
std::int64_t number{};
return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
}
case 0xDC: // array 16
{
std::uint16_t len;
std::uint16_t len{};
return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
}
case 0xDD: // array 32
{
std::uint32_t len;
std::uint32_t len{};
return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
}
case 0xDE: // map 16
{
std::uint16_t len;
std::uint16_t len{};
return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
}
case 0xDF: // map 32
{
std::uint32_t len;
std::uint32_t len{};
return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
}
@@ -1473,19 +1471,19 @@ class binary_reader
case 0xD9: // str 8
{
std::uint8_t len;
std::uint8_t len{};
return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
}
case 0xDA: // str 16
{
std::uint16_t len;
std::uint16_t len{};
return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
}
case 0xDB: // str 32
{
std::uint32_t len;
std::uint32_t len{};
return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
}
@@ -1520,29 +1518,29 @@ class binary_reader
{
case 0xC4: // bin 8
{
std::uint8_t len;
std::uint8_t len{};
return get_number(input_format_t::msgpack, len) and
get_binary(input_format_t::msgpack, len, result);
}
case 0xC5: // bin 16
{
std::uint16_t len;
std::uint16_t len{};
return get_number(input_format_t::msgpack, len) and
get_binary(input_format_t::msgpack, len, result);
}
case 0xC6: // bin 32
{
std::uint32_t len;
std::uint32_t len{};
return get_number(input_format_t::msgpack, len) and
get_binary(input_format_t::msgpack, len, result);
}
case 0xC7: // ext 8
{
std::uint8_t len;
std::int8_t subtype;
std::uint8_t len{};
std::int8_t subtype{};
return get_number(input_format_t::msgpack, len) and
get_number(input_format_t::msgpack, subtype) and
get_binary(input_format_t::msgpack, len, result) and
@@ -1551,8 +1549,8 @@ class binary_reader
case 0xC8: // ext 16
{
std::uint16_t len;
std::int8_t subtype;
std::uint16_t len{};
std::int8_t subtype{};
return get_number(input_format_t::msgpack, len) and
get_number(input_format_t::msgpack, subtype) and
get_binary(input_format_t::msgpack, len, result) and
@@ -1561,8 +1559,8 @@ class binary_reader
case 0xC9: // ext 32
{
std::uint32_t len;
std::int8_t subtype;
std::uint32_t len{};
std::int8_t subtype{};
return get_number(input_format_t::msgpack, len) and
get_number(input_format_t::msgpack, subtype) and
get_binary(input_format_t::msgpack, len, result) and
@@ -1571,7 +1569,7 @@ class binary_reader
case 0xD4: // fixext 1
{
std::int8_t subtype;
std::int8_t subtype{};
return get_number(input_format_t::msgpack, subtype) and
get_binary(input_format_t::msgpack, 1, result) and
assign_and_return_true(subtype);
@@ -1579,7 +1577,7 @@ class binary_reader
case 0xD5: // fixext 2
{
std::int8_t subtype;
std::int8_t subtype{};
return get_number(input_format_t::msgpack, subtype) and
get_binary(input_format_t::msgpack, 2, result) and
assign_and_return_true(subtype);
@@ -1587,7 +1585,7 @@ class binary_reader
case 0xD6: // fixext 4
{
std::int8_t subtype;
std::int8_t subtype{};
return get_number(input_format_t::msgpack, subtype) and
get_binary(input_format_t::msgpack, 4, result) and
assign_and_return_true(subtype);
@@ -1595,7 +1593,7 @@ class binary_reader
case 0xD7: // fixext 8
{
std::int8_t subtype;
std::int8_t subtype{};
return get_number(input_format_t::msgpack, subtype) and
get_binary(input_format_t::msgpack, 8, result) and
assign_and_return_true(subtype);
@@ -1603,7 +1601,7 @@ class binary_reader
case 0xD8: // fixext 16
{
std::int8_t subtype;
std::int8_t subtype{};
return get_number(input_format_t::msgpack, subtype) and
get_binary(input_format_t::msgpack, 16, result) and
assign_and_return_true(subtype);
@@ -1712,31 +1710,31 @@ class binary_reader
{
case 'U':
{
std::uint8_t len;
std::uint8_t len{};
return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
}
case 'i':
{
std::int8_t len;
std::int8_t len{};
return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
}
case 'I':
{
std::int16_t len;
std::int16_t len{};
return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
}
case 'l':
{
std::int32_t len;
std::int32_t len{};
return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
}
case 'L':
{
std::int64_t len;
std::int64_t len{};
return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
}
@@ -1756,7 +1754,7 @@ class binary_reader
{
case 'U':
{
std::uint8_t number;
std::uint8_t number{};
if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
{
return false;
@@ -1767,7 +1765,7 @@ class binary_reader
case 'i':
{
std::int8_t number;
std::int8_t number{};
if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
{
return false;
@@ -1778,7 +1776,7 @@ class binary_reader
case 'I':
{
std::int16_t number;
std::int16_t number{};
if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
{
return false;
@@ -1789,7 +1787,7 @@ class binary_reader
case 'l':
{
std::int32_t number;
std::int32_t number{};
if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
{
return false;
@@ -1800,7 +1798,7 @@ class binary_reader
case 'L':
{
std::int64_t number;
std::int64_t number{};
if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
{
return false;
@@ -1885,43 +1883,43 @@ class binary_reader
case 'U':
{
std::uint8_t number;
std::uint8_t number{};
return get_number(input_format_t::ubjson, number) and sax->number_unsigned(number);
}
case 'i':
{
std::int8_t number;
std::int8_t number{};
return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
}
case 'I':
{
std::int16_t number;
std::int16_t number{};
return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
}
case 'l':
{
std::int32_t number;
std::int32_t number{};
return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
}
case 'L':
{
std::int64_t number;
std::int64_t number{};
return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
}
case 'd':
{
float number;
float number{};
return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
}
case 'D':
{
double number;
double number{};
return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
}