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

remove endptr parameter from strtox

Browse Source
This commit is contained in:
Jett 2016-10-16 17:26:11 -05:00
parent 201e1f37fd
commit b7a978f766
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/json.hpp
View File

@ -8817,14 +8817,11 @@ basic_json_parser_63:
@param[in] st the string we will parse @param[in] st the string we will parse
@param[in,out] endptr recieves a pointer to the first character after
the number
@return the floating point number @return the floating point number
*/ */
template <typename T, typename = typename std::enable_if< template <typename T, typename = typename std::enable_if<
std::is_floating_point<T>::value>::type> std::is_floating_point<T>::value>::type>
T strtox(const char *st, char **endptr) const T strtox(const char *st) const
{ {
constexpr std::array<long double, 9> powerof10 { constexpr std::array<long double, 9> powerof10 {
{1.e1L, 1.e2L, 1.e4L, 1.e8L, 1.e16L, 1.e32L, 1.e64L, 1.e128L, 1.e256L} {1.e1L, 1.e2L, 1.e4L, 1.e8L, 1.e16L, 1.e32L, 1.e64L, 1.e128L, 1.e256L}
@ -8867,9 +8864,6 @@ basic_json_parser_63:
} }
// read in explicit exponent and calculate real exponent. // read in explicit exponent and calculate real exponent.
// if exponent is bogus (i.e. "1.234empty" or "1.234e+mpty") restore
// bogus exponent back onto returned string (endptr).
if (*fst == 'e' or *fst == 'E') if (*fst == 'e' or *fst == 'E')
{ {
cp = *++fst; cp = *++fst;
@ -8953,11 +8947,6 @@ skip_loop:
} }
} }
if (endptr != nullptr)
{
*endptr = const_cast<char *>(fst);
}
return result; return result;
} }
@ -9060,7 +9049,7 @@ skip_loop:
else else
{ {
// parse with strtod // parse with strtod
result.m_value.number_float = strtox<number_float_t>(reinterpret_cast<typename string_t::const_pointer>(m_start), nullptr); result.m_value.number_float = strtox<number_float_t>(reinterpret_cast<typename string_t::const_pointer>(m_start));
} }
// save the type // save the type

15
src/json.hpp.re2c
View File

@ -8114,14 +8114,11 @@ class basic_json
@param[in] st the string we will parse @param[in] st the string we will parse
@param[in,out] endptr recieves a pointer to the first character after
the number
@return the floating point number @return the floating point number
*/ */
template <typename T, typename = typename std::enable_if< template <typename T, typename = typename std::enable_if<
std::is_floating_point<T>::value>::type> std::is_floating_point<T>::value>::type>
T strtox(const char *st, char **endptr) const T strtox(const char *st) const
{ {
constexpr std::array<long double, 9> powerof10 { constexpr std::array<long double, 9> powerof10 {
{1.e1L, 1.e2L, 1.e4L, 1.e8L, 1.e16L, 1.e32L, 1.e64L, 1.e128L, 1.e256L} {1.e1L, 1.e2L, 1.e4L, 1.e8L, 1.e16L, 1.e32L, 1.e64L, 1.e128L, 1.e256L}
@ -8164,9 +8161,6 @@ class basic_json
} }
// read in explicit exponent and calculate real exponent. // read in explicit exponent and calculate real exponent.
// if exponent is bogus (i.e. "1.234empty" or "1.234e+mpty") restore
// bogus exponent back onto returned string (endptr).
if (*fst == 'e' or *fst == 'E') if (*fst == 'e' or *fst == 'E')
{ {
cp = *++fst; cp = *++fst;
@ -8250,11 +8244,6 @@ skip_loop:
} }
} }
if (endptr != nullptr)
{
*endptr = const_cast<char *>(fst);
}
return result; return result;
} }
@ -8357,7 +8346,7 @@ skip_loop:
else else
{ {
// parse with strtod // parse with strtod
result.m_value.number_float = strtox<number_float_t>(reinterpret_cast<typename string_t::const_pointer>(m_start), nullptr); result.m_value.number_float = strtox<number_float_t>(reinterpret_cast<typename string_t::const_pointer>(m_start));
} }
// save the type // save the type