voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #983 from boolean-false/stringutil_parse_double_fix

Browse source 
Перевел parse_double на from_chars
This commit is contained in:
MihailRis 2026-09-20 22:29:13 +03:00 • committed by GitHub
commit e2e7c9b0b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 32 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/util/stringutil.cpp
View file

@ -1,9 +1,11 @@
#include "stringutil.hpp" #include "stringutil.hpp"
#include <algorithm> #include <algorithm>
#include <cmath> #include <charconv>
#include <iomanip> #include <cctype>
#include <locale> #include <cmath>
#include <iomanip>
#include <locale>
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
@ -509,17 +511,22 @@ int util::replaceAll(
return replace_all(str, from, to); return replace_all(str, from, to);
} }
// replace it with std::from_chars in the far far future double util::parse_double(const std::string& str) {
double util::parse_double(const std::string& str) { const char* begin = str.data();
std::istringstream ss(str); const char* end = begin + str.size();
ss.imbue(std::locale("C")); while (begin != end && std::isspace(static_cast<unsigned char>(*begin))) {
double d; begin++;
ss >> d; }
if (ss.fail()) { if (begin != end && *begin == '+') {
throw std::runtime_error("invalid number format"); begin++;
} }
return d; double d = 0.0;
} const auto result = std::from_chars(begin, end, d);
if (result.ec != std::errc()) {
throw std::runtime_error("invalid number format");
}
return d;
}
double util::parse_double(const std::string& str, size_t offset, size_t len) { double util::parse_double(const std::string& str, size_t offset, size_t len) {
return parse_double(str.substr(offset, len)); return parse_double(str.substr(offset, len));

8
test/util/stringutil.cpp
View file

@ -68,6 +68,14 @@ TEST(stringutil, base64_urlsafe) {
} }
} }
TEST(stringutil, parse_double) {
EXPECT_DOUBLE_EQ(util::parse_double("53.125"), 53.125);
EXPECT_DOUBLE_EQ(util::parse_double("-0.25"), -0.25);
EXPECT_DOUBLE_EQ(util::parse_double(" +12.5"), 12.5);
EXPECT_DOUBLE_EQ(util::parse_double("xx1.75yy", 2, 4), 1.75);
EXPECT_THROW(util::parse_double("not-a-number"), std::runtime_error);
}
class StringParser : BasicParser<char> { class StringParser : BasicParser<char> {
public: public:
StringParser(std::string_view source) : BasicParser("<string>", source) {} StringParser(std::string_view source) : BasicParser("<string>", source) {}