7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-30 03:15:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement float parsing to numFromString

Browse source
This commit is contained in:
altalk23 2024-02-18 17:04:19 +03:00
parent d0ed9844be
commit 6d91804c57
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
loader/include/Geode/utils/general.hpp
View file

@ -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,13 +105,29 @@ 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) {
Num result; if constexpr (std::is_floating_point_v<Num>) {
auto [_, ec] = std::from_chars(str.data(), str.data() + str.size(), result, base); Num val = {};
switch (ec) { char* strEnd;
case std::errc(): return Ok(result); errno = 0;
case std::errc::invalid_argument: return Err("String is not a number"); if (std::setlocale(LC_NUMERIC, "en_US.utf8")) {
case std::errc::result_out_of_range: return Err("Number is too large to fit"); if constexpr (std::is_same_v<Num, float>) val = std::strtof(str.data(), &strEnd);
default: return Err("Unknown error"); 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;
auto [_, ec] = std::from_chars(str.data(), str.data() + str.size(), result, base);
switch (ec) {
case std::errc(): return Ok(result);
case std::errc::invalid_argument: return Err("String is not a number");
case std::errc::result_out_of_range: return Err("Number is too large to fit");
default: return Err("Unknown error");
}
} }
} }