External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ move integer conversion out of scan_number

Browse Source
This commit is contained in:
Niels Lohmann 2020-07-09 14:21:39 +02:00
parent d740622f96
commit 0c4e6aa2cd
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
2 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/nlohmann/detail/input/lexer.hpp
View File

@ -918,6 +918,20 @@ class lexer : public lexer_base<BasicJsonType>
f = std::strtold(str, endptr); f = std::strtold(str, endptr);
} }
template < detail::enable_if_t<sizeof(number_unsigned_t) <= 64, int> = 0>
JSON_HEDLEY_NON_NULL(2)
auto strtoull(const char* str, char** str_end) -> decltype(std::strtoull(str, str_end, 10))
{
return std::strtoull(str, str_end, 10);
}
template < detail::enable_if_t<sizeof(number_integer_t) <= 64, int> = 0>
JSON_HEDLEY_NON_NULL(2)
auto strtoll(const char* str, char** str_end) -> decltype(std::strtoll(str, str_end, 10))
{
return std::strtoll(str, str_end, 10);
}
/*! /*!
@brief scan a number literal @brief scan a number literal
@ -1242,7 +1256,7 @@ scan_number_done:
// try to parse integers first and fall back to floats // try to parse integers first and fall back to floats
if (number_type == token_type::value_unsigned) if (number_type == token_type::value_unsigned)
{ {
const auto x = std::strtoull(token_buffer.data(), &endptr, 10); const auto x = strtoull(token_buffer.data(), &endptr);
// we checked the number format before // we checked the number format before
assert(endptr == token_buffer.data() + token_buffer.size()); assert(endptr == token_buffer.data() + token_buffer.size());
@ -1258,7 +1272,7 @@ scan_number_done:
} }
else if (number_type == token_type::value_integer) else if (number_type == token_type::value_integer)
{ {
const auto x = std::strtoll(token_buffer.data(), &endptr, 10); const auto x = strtoll(token_buffer.data(), &endptr);
// we checked the number format before // we checked the number format before
assert(endptr == token_buffer.data() + token_buffer.size()); assert(endptr == token_buffer.data() + token_buffer.size());

18
single_include/nlohmann/json.hpp
View File

@ -9030,6 +9030,20 @@ class lexer : public lexer_base<BasicJsonType>
f = std::strtold(str, endptr); f = std::strtold(str, endptr);
} }
template < detail::enable_if_t<sizeof(number_unsigned_t) <= 64, int> = 0>
JSON_HEDLEY_NON_NULL(2)
auto strtoull(const char* str, char** str_end) -> decltype(std::strtoull(str, str_end, 10))
{
return std::strtoull(str, str_end, 10);
}
template < detail::enable_if_t<sizeof(number_integer_t) <= 64, int> = 0>
JSON_HEDLEY_NON_NULL(2)
auto strtoll(const char* str, char** str_end) -> decltype(std::strtoll(str, str_end, 10))
{
return std::strtoll(str, str_end, 10);
}
/*! /*!
@brief scan a number literal @brief scan a number literal
@ -9354,7 +9368,7 @@ scan_number_done:
// try to parse integers first and fall back to floats // try to parse integers first and fall back to floats
if (number_type == token_type::value_unsigned) if (number_type == token_type::value_unsigned)
{ {
const auto x = std::strtoull(token_buffer.data(), &endptr, 10); const auto x = strtoull(token_buffer.data(), &endptr);
// we checked the number format before // we checked the number format before
assert(endptr == token_buffer.data() + token_buffer.size()); assert(endptr == token_buffer.data() + token_buffer.size());
@ -9370,7 +9384,7 @@ scan_number_done:
} }
else if (number_type == token_type::value_integer) else if (number_type == token_type::value_integer)
{ {
const auto x = std::strtoll(token_buffer.data(), &endptr, 10); const auto x = strtoll(token_buffer.data(), &endptr);
// we checked the number format before // we checked the number format before
assert(endptr == token_buffer.data() + token_buffer.size()); assert(endptr == token_buffer.data() + token_buffer.size());