Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use std::stod() on APPLE OSX #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use std::stod() on APPLE OSX #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion minijson_reader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,24 @@ class value final
std::string_view m_raw_value = "null";
}; // class value

#ifdef __APPLE__
inline double parse_double(const std::string_view& str) {
if (str.empty()) // we don't accept empty strings
{
throw bad_value_cast("value::as<T>(): value type is not double");
}

// we perform this check to reject hex numbers (supported in C++11) and string with leading spaces
for (const char c : str) {
if (!(isdigit(c) || (c == '+') || (c == '-') || (c == '.') || (c == 'e') || (c == 'E'))) {
throw bad_value_cast("value::as<T>(): value type is not double");
}
}

return std::stod(str.data());
}
#endif

// Fallback behavior of value::as<T>() when no user-provided value_as
// specialization for T exists.
// This function is also meant to be called directly by the user in case they
Expand Down Expand Up @@ -1088,6 +1106,16 @@ T value_as_default(const value v)
// However, we do a paranoia check for emptiness.
return !raw.empty() && raw[0] == 't';
}
#ifdef __APPLE__
else if constexpr (std::is_same_v<T, float>)
{
return parse_double(raw);
}
else if constexpr (std::is_same_v<T, double>)
{
return parse_double(raw);
}
#endif
else if constexpr (std::is_arithmetic_v<T>)
{
if (v.type() != Number)
Expand All @@ -1099,7 +1127,7 @@ T value_as_default(const value v)
T result {}; // value initialize to silence compiler warnings
const auto begin = raw.data();
const auto end = raw.data() + raw.size();
const auto [parse_end, error] = std::from_chars(begin, end, result);
const auto [parse_end, error]{std::from_chars(begin, end, result)};
if (parse_end != end || error != std::errc())
{
throw std::range_error(
Expand Down