Skip to content

validation.h: stold => std::from_chars #464

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

validation.h: stold => std::from_chars #464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b98744f
validation.h: stold => std::from_chars
RagnarGrootKoerkamp Oct 26, 2022
ffad86f
Merge branch 'main' into from_chars
mzuenni Sep 27, 2025
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
33 changes: 14 additions & 19 deletions headers/validation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,15 +1232,14 @@ class Validator {
WA(name, ": Want integer, found nothing");
}
long long v;
try {
auto begin = s.c_str(), end = begin + s.size();
auto [ptr, ec] = std::from_chars(begin, end, v);
if(ptr != end or ec != std::errc{})
WA(name, ": Parsing " + s + " as long long failed! Did not process all characters");
} catch(const std::out_of_range& e) {
auto begin = s.c_str(), end = begin + s.size();
auto [ptr, ec] = std::from_chars(begin, end, v);
if(ec == std::errc::result_out_of_range) {
WA(name, ": Number " + s + " does not fit in a long long!");
} catch(const std::invalid_argument& e) {
WA("Parsing " + s + " as long long failed!");
} else if(ptr != end) {
WA(name, ": Parsing " + s + " as long long failed! Did not process all characters");
} else if(ec != std::errc{}) {
WA(name, ": Parsing " + s + " as long long failed!");
}
// Check for leading zero.
if(v == 0) {
Expand All @@ -1260,18 +1259,14 @@ class Validator {
assert(!gen);
std::string s = get_string("long double");
long double v;
try {
size_t chars_processed;
v = stold(s, &chars_processed);
if(chars_processed != s.size())
WA(name, ": Parsing ", s,
" as long double failed! Did not process all characters.");
if(strict_float && !std::regex_match(s, float_regex))
WA(name, ": Parsing ", s, " failed, because it does not match the strict float_regex!");
} catch(const std::out_of_range& e) {
auto begin = s.c_str(), end = begin + s.size();
auto [ptr, ec] = std::from_chars(begin, end, v);
if(ec == std::errc::result_out_of_range) {
WA(name, ": Number " + s + " does not fit in a long double!");
} catch(const std::invalid_argument& e) {
WA("Parsing " + s + " as long double failed!");
} else if(ptr != end) {
WA(name, ": Parsing " + s + " as long double failed! Did not process all characters");
} else if(ec != std::errc{}) {
WA(name, ": Parsing " + s + " as long double failed!");
}
return v;
}
Expand Down
Loading