mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-14 22:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed unused struct; fixed comments

Browse Source
This commit is contained in:
Alex Astashyn 2016-12-08 21:38:14 -05:00
parent 27d9740ad6
commit 38499e84fc
2 changed files with 24 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/json.hpp
View File

@ -9065,12 +9065,6 @@ basic_json_parser_66:
@brief parse string into a built-in arithmetic type as if @brief parse string into a built-in arithmetic type as if
the current locale is POSIX. the current locale is POSIX.
e.g. const auto x = static_cast<float>("123.4");
throw if can't parse the entire string as a number,
or if the destination type is integral and the value
is outside of the type's range.
note: in floating-point case strtod may parse note: in floating-point case strtod may parse
past the token's end - this is not an error. past the token's end - this is not an error.
@ -9079,34 +9073,15 @@ basic_json_parser_66:
struct strtonum struct strtonum
{ {
public: public:
template<typename T>
struct maybe
{
T x;
bool valid;
maybe(const T& xx)
: x(xx), valid(true)
{}
maybe() : x(), valid(false)
{}
operator bool() const
{
return valid;
}
const T& operator*() const
{
return x;
}
};
strtonum(const char* start, const char* end) strtonum(const char* start, const char* end)
: m_start(start), m_end(end) : m_start(start), m_end(end)
{} {}
/// return true iff parsed successfully as
/// number of type T.
///
/// @val shall contain parsed value, or
/// undefined value if could not parse.
template<typename T, template<typename T,
typename = typename std::enable_if< typename = typename std::enable_if<
std::is_arithmetic<T>::value>::type > std::is_arithmetic<T>::value>::type >
@ -9115,33 +9090,13 @@ basic_json_parser_66:
return parse(val, std::is_integral<T>()); return parse(val, std::is_integral<T>());
} }
template<typename T, /// return true iff token matches ^[+-]\d+$
typename = typename std::enable_if< ///
std::is_arithmetic<T>::value>::type > /// this is a helper to determine whether to
operator T() const /// parse the token into floating-point or
{ /// integral type. We wouldn't need it if
T val{0}; /// we had separate token types for integral
/// and floating-point cases.
if (parse(val, std::is_integral<T>()))
{
return val;
}
throw std::invalid_argument(
std::string()
+ "Can't parse '"
+ std::string(m_start, m_end)
+ "' as type "
+ typeid(T).name());
}
// return true iff token matches ^[+-]\d+$
//
// this is a helper to determine whether to
// parse the token into floating-point or
// integral type. We wouldn't need it if
// we had separate token types for integral
// and floating-point cases.
bool is_integral() const bool is_integral() const
{ {
const char* p = m_start; const char* p = m_start;

69
src/json.hpp.re2c
View File

@ -8214,12 +8214,6 @@ class basic_json
@brief parse string into a built-in arithmetic type as if @brief parse string into a built-in arithmetic type as if
the current locale is POSIX. the current locale is POSIX.
e.g. const auto x = static_cast<float>("123.4");
throw if can't parse the entire string as a number,
or if the destination type is integral and the value
is outside of the type's range.
note: in floating-point case strtod may parse note: in floating-point case strtod may parse
past the token's end - this is not an error. past the token's end - this is not an error.
@ -8228,34 +8222,15 @@ class basic_json
struct strtonum struct strtonum
{ {
public: public:
template<typename T>
struct maybe
{
T x;
bool valid;
maybe(const T& xx)
: x(xx), valid(true)
{}
maybe() : x(), valid(false)
{}
operator bool() const
{
return valid;
}
const T& operator*() const
{
return x;
}
};
strtonum(const char* start, const char* end) strtonum(const char* start, const char* end)
: m_start(start), m_end(end) : m_start(start), m_end(end)
{} {}
/// return true iff parsed successfully as
/// number of type T.
///
/// @val shall contain parsed value, or
/// undefined value if could not parse.
template<typename T, template<typename T,
typename = typename std::enable_if< typename = typename std::enable_if<
std::is_arithmetic<T>::value>::type > std::is_arithmetic<T>::value>::type >
@ -8264,33 +8239,13 @@ class basic_json
return parse(val, std::is_integral<T>()); return parse(val, std::is_integral<T>());
} }
template<typename T, /// return true iff token matches ^[+-]\d+$
typename = typename std::enable_if< ///
std::is_arithmetic<T>::value>::type > /// this is a helper to determine whether to
operator T() const /// parse the token into floating-point or
{ /// integral type. We wouldn't need it if
T val{0}; /// we had separate token types for integral
/// and floating-point cases.
if (parse(val, std::is_integral<T>()))
{
return val;
}
throw std::invalid_argument(
std::string()
+ "Can't parse '"
+ std::string(m_start, m_end)
+ "' as type "
+ typeid(T).name());
}
// return true iff token matches ^[+-]\d+$
//
// this is a helper to determine whether to
// parse the token into floating-point or
// integral type. We wouldn't need it if
// we had separate token types for integral
// and floating-point cases.
bool is_integral() const bool is_integral() const
{ {
const char* p = m_start; const char* p = m_start;