RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-19 20:35:06 +00:00
Code Issues Activity Actions

LibCore: Add an ArgsParser::add_option() overload for doubles

Browse source
This commit is contained in:
Nico Weber 2020-11-05 15:57:22 -05:00 • committed by Andreas Kling
parent e673abb93f
commit b143e604d7
2 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Libraries/LibCore/ArgsParser.cpp
View file

@ -32,6 +32,17 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
static constexpr bool isnan(double __x) { return __builtin_isnan(__x); }
static Optional<double> convert_to_double(const char* s)
{
char* p;
double v = strtod(s, &p);
if (isnan(v) || p == s)
return {};
return v;
}
namespace Core { namespace Core {
ArgsParser::ArgsParser() ArgsParser::ArgsParser()
@ -289,6 +300,24 @@ void ArgsParser::add_option(int& value, const char* help_string, const char* lon
add_option(move(option)); add_option(move(option));
} }
void ArgsParser::add_option(double& value, const char* help_string, const char* long_name, char short_name, const char* value_name)
{
Option option {
true,
help_string,
long_name,
short_name,
value_name,
[&value](const char* s) {
auto opt = convert_to_double(s);
value = opt.value_or(0.0);
return opt.has_value();
}
};
add_option(move(option));
}
void ArgsParser::add_positional_argument(Arg&& arg) void ArgsParser::add_positional_argument(Arg&& arg)
{ {
m_positional_args.append(move(arg)); m_positional_args.append(move(arg));
@ -325,8 +354,6 @@ void ArgsParser::add_positional_argument(int& value, const char* help_string, co
add_positional_argument(move(arg)); add_positional_argument(move(arg));
} }
static constexpr bool isnan(double __x) { return __builtin_isnan(__x); }
void ArgsParser::add_positional_argument(double& value, const char* help_string, const char* name, Required required) void ArgsParser::add_positional_argument(double& value, const char* help_string, const char* name, Required required)
{ {
Arg arg { Arg arg {
@ -335,13 +362,9 @@ void ArgsParser::add_positional_argument(double& value, const char* help_string,
required == Required::Yes ? 1 : 0, required == Required::Yes ? 1 : 0,
1, 1,
[&value](const char* s) { [&value](const char* s) {
char* p; auto opt = convert_to_double(s);
double v = strtod(s, &p); value = opt.value_or(0.0);
bool valid_value = !isnan(v) && p != s; return opt.has_value();
if (valid_value) {
value = v;
}
return valid_value;
} }
}; };
add_positional_argument(move(arg)); add_positional_argument(move(arg));

1
Libraries/LibCore/ArgsParser.h
View file

@ -73,6 +73,7 @@ public:
void add_option(bool& value, const char* help_string, const char* long_name, char short_name); void add_option(bool& value, const char* help_string, const char* long_name, char short_name);
void add_option(const char*& value, const char* help_string, const char* long_name, char short_name, const char* value_name); void add_option(const char*& value, const char* help_string, const char* long_name, char short_name, const char* value_name);
void add_option(int& value, const char* help_string, const char* long_name, char short_name, const char* value_name); void add_option(int& value, const char* help_string, const char* long_name, char short_name, const char* value_name);
void add_option(double& value, const char* help_string, const char* long_name, char short_name, const char* value_name);
void add_positional_argument(Arg&&); void add_positional_argument(Arg&&);
void add_positional_argument(const char*& value, const char* help_string, const char* name, Required required = Required::Yes); void add_positional_argument(const char*& value, const char* help_string, const char* name, Required required = Required::Yes);