mirror of
https://github.com/nlohmann/json.git
synced 2025-07-12 09:21:42 +03:00
🔨 further cleanup
This commit is contained in:
@ -9444,8 +9444,8 @@ class basic_json
|
||||
literal_false, ///< the `false` literal
|
||||
literal_null, ///< the `null` literal
|
||||
value_string, ///< a string -- use get_string() for actual value
|
||||
value_unsigned_integer, ///< an unsigned integer -- use get_number() for actual value
|
||||
value_signed_integer, ///< a signed integer -- use get_number() for actual value
|
||||
value_unsigned, ///< an unsigned integer -- use get_number() for actual value
|
||||
value_integer, ///< a signed integer -- use get_number() for actual value
|
||||
value_float, ///< an floating point number -- use get_number() for actual value
|
||||
begin_array, ///< the character for array begin `[`
|
||||
begin_object, ///< the character for object begin `{`
|
||||
@ -9598,8 +9598,8 @@ class basic_json
|
||||
return "null literal";
|
||||
case token_type::value_string:
|
||||
return "string literal";
|
||||
case lexer::token_type::value_unsigned_integer:
|
||||
case lexer::token_type::value_signed_integer:
|
||||
case lexer::token_type::value_unsigned:
|
||||
case lexer::token_type::value_integer:
|
||||
case lexer::token_type::value_float:
|
||||
return "number literal";
|
||||
case token_type::begin_array:
|
||||
@ -9699,9 +9699,9 @@ class basic_json
|
||||
frac = decimal_point digit+;
|
||||
int = (zero | digit_1_9 digit*);
|
||||
number_unsigned = int;
|
||||
number_unsigned { last_token_type = token_type::value_unsigned_integer; break; }
|
||||
number_signed = minus int;
|
||||
number_signed { last_token_type = token_type::value_signed_integer; break; }
|
||||
number_unsigned { last_token_type = token_type::value_unsigned; break; }
|
||||
number_integer = minus int;
|
||||
number_integer { last_token_type = token_type::value_integer; break; }
|
||||
number_float = minus? int frac? exp?;
|
||||
number_float { last_token_type = token_type::value_float; break; }
|
||||
|
||||
@ -10163,19 +10163,19 @@ class basic_json
|
||||
{
|
||||
assert(m_start != nullptr);
|
||||
assert(m_start < m_cursor);
|
||||
assert((token == token_type::value_unsigned_integer) or
|
||||
(token == token_type::value_signed_integer) or
|
||||
assert((token == token_type::value_unsigned) or
|
||||
(token == token_type::value_integer) or
|
||||
(token == token_type::value_float));
|
||||
|
||||
strtonum num(reinterpret_cast<const char*>(m_start),
|
||||
reinterpret_cast<const char*>(m_cursor));
|
||||
strtonum num_converter(reinterpret_cast<const char*>(m_start),
|
||||
reinterpret_cast<const char*>(m_cursor));
|
||||
|
||||
switch (token)
|
||||
{
|
||||
case lexer::token_type::value_unsigned_integer:
|
||||
case lexer::token_type::value_unsigned:
|
||||
{
|
||||
number_unsigned_t val{0};
|
||||
if (num.to(val))
|
||||
number_unsigned_t val;
|
||||
if (num_converter.to(val))
|
||||
{
|
||||
result.m_type = value_t::number_unsigned;
|
||||
result.m_value = val;
|
||||
@ -10184,10 +10184,10 @@ class basic_json
|
||||
break;
|
||||
}
|
||||
|
||||
case lexer::token_type::value_signed_integer:
|
||||
case lexer::token_type::value_integer:
|
||||
{
|
||||
number_integer_t val{0};
|
||||
if (num.to(val))
|
||||
number_integer_t val;
|
||||
if (num_converter.to(val))
|
||||
{
|
||||
result.m_type = value_t::number_integer;
|
||||
result.m_value = val;
|
||||
@ -10202,8 +10202,10 @@ class basic_json
|
||||
}
|
||||
}
|
||||
|
||||
number_float_t val{0};
|
||||
if (not num.to(val))
|
||||
// parse float (either explicitly or because a previous conversion
|
||||
// failed)
|
||||
number_float_t val;
|
||||
if (not num_converter.to(val))
|
||||
{
|
||||
// couldn't parse as float_t
|
||||
result.m_type = value_t::discarded;
|
||||
@ -10462,8 +10464,8 @@ class basic_json
|
||||
break;
|
||||
}
|
||||
|
||||
case lexer::token_type::value_unsigned_integer:
|
||||
case lexer::token_type::value_signed_integer:
|
||||
case lexer::token_type::value_unsigned:
|
||||
case lexer::token_type::value_integer:
|
||||
case lexer::token_type::value_float:
|
||||
{
|
||||
m_lexer.get_number(result, last_token);
|
||||
|
Reference in New Issue
Block a user