mirror of
https://github.com/geode-sdk/geode.git
synced 2024-11-30 03:15:38 -05:00
implement float parsing to numFromString
This commit is contained in:
parent
d0ed9844be
commit
6d91804c57
1 changed files with 24 additions and 7 deletions
|
@ -11,6 +11,7 @@
|
||||||
#include <ghc/fs_fwd.hpp>
|
#include <ghc/fs_fwd.hpp>
|
||||||
#include <matjson.hpp>
|
#include <matjson.hpp>
|
||||||
#include <charconv>
|
#include <charconv>
|
||||||
|
#include <clocale>
|
||||||
|
|
||||||
// for some reason std::filesystem::path doesn't have std::hash defined in C++17
|
// for some reason std::filesystem::path doesn't have std::hash defined in C++17
|
||||||
// and ghc seems to have inherited this limitation
|
// and ghc seems to have inherited this limitation
|
||||||
|
@ -104,6 +105,21 @@ namespace geode {
|
||||||
*/
|
*/
|
||||||
template <class Num>
|
template <class Num>
|
||||||
Result<Num> numFromString(std::string_view const str, int base = 10) {
|
Result<Num> numFromString(std::string_view const str, int base = 10) {
|
||||||
|
if constexpr (std::is_floating_point_v<Num>) {
|
||||||
|
Num val = {};
|
||||||
|
char* strEnd;
|
||||||
|
errno = 0;
|
||||||
|
if (std::setlocale(LC_NUMERIC, "en_US.utf8")) {
|
||||||
|
if constexpr (std::is_same_v<Num, float>) val = std::strtof(str.data(), &strEnd);
|
||||||
|
else if constexpr (std::is_same_v<Num, double>) val = std::strtod(str.data(), &strEnd);
|
||||||
|
else if constexpr (std::is_same_v<Num, long double>) val = std::strtold(str.data(), &strEnd);
|
||||||
|
if (errno == ERANGE) return Err("Number is too large to fit");
|
||||||
|
else if (strEnd == str.data()) return Err("String is not a number");
|
||||||
|
else return Ok(val);
|
||||||
|
}
|
||||||
|
else return Err("Failed to set locale");
|
||||||
|
}
|
||||||
|
else {
|
||||||
Num result;
|
Num result;
|
||||||
auto [_, ec] = std::from_chars(str.data(), str.data() + str.size(), result, base);
|
auto [_, ec] = std::from_chars(str.data(), str.data() + str.size(), result, base);
|
||||||
switch (ec) {
|
switch (ec) {
|
||||||
|
@ -113,6 +129,7 @@ namespace geode {
|
||||||
default: return Err("Unknown error");
|
default: return Err("Unknown error");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
GEODE_DLL std::string timePointAsString(std::chrono::system_clock::time_point const& tp);
|
GEODE_DLL std::string timePointAsString(std::chrono::system_clock::time_point const& tp);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue