RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 11:47:45 +00:00
Code Issues Activity Actions

LibCore: Implement integral ArgsParser options through a template

Browse source 
This keeps us from having to duplicate code for each data type we add.
This commit is contained in:
Tim Schumacher 2022-07-21 11:05:19 +02:00 • committed by Andreas Kling
parent 094ba6525f
commit 0f66963a56
2 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Userland/Libraries/LibCore/ArgsParser.cpp
View file

@ -460,7 +460,8 @@ void ArgsParser::add_option(StringView& value, char const* help_string, char con
add_option(move(option)); add_option(move(option));
} }
void ArgsParser::add_option(int& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode) template<typename Integral>
void ArgsParser::add_option(Integral& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode) requires(IsIntegral<Integral>)
{ {
Option option { Option option {
OptionArgumentMode::Required, OptionArgumentMode::Required,
@ -469,7 +470,12 @@ void ArgsParser::add_option(int& value, char const* help_string, char const* lon
short_name, short_name,
value_name, value_name,
[&value](char const* s) { [&value](char const* s) {
auto opt = StringView { s, strlen(s) }.to_int(); auto view = StringView { s, strlen(s) };
Optional<Integral> opt;
if constexpr (IsSigned<Integral>)
opt = view.to_int<Integral>();
else
opt = view.to_uint<Integral>();
value = opt.value_or(0); value = opt.value_or(0);
return opt.has_value(); return opt.has_value();
}, },
@ -478,23 +484,8 @@ void ArgsParser::add_option(int& value, char const* help_string, char const* lon
add_option(move(option)); add_option(move(option));
} }
void ArgsParser::add_option(unsigned& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode) template void ArgsParser::add_option(int&, char const*, char const*, char, char const*, OptionHideMode);
{ template void ArgsParser::add_option(unsigned&, char const*, char const*, char, char const*, OptionHideMode);
Option option {
OptionArgumentMode::Required,
help_string,
long_name,
short_name,
value_name,
[&value](char const* s) {
auto opt = StringView { s, strlen(s) }.to_uint();
value = opt.value_or(0);
return opt.has_value();
},
hide_mode,
};
add_option(move(option));
}
void ArgsParser::add_option(double& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode) void ArgsParser::add_option(double& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode)
{ {

4
Userland/Libraries/LibCore/ArgsParser.h
View file

@ -89,8 +89,8 @@ public:
void add_option(char const*& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None); void add_option(char const*& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None);
void add_option(String& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None); void add_option(String& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None);
void add_option(StringView& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None); void add_option(StringView& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None);
void add_option(int& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None); template<typename Integral>
void add_option(unsigned& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None); void add_option(Integral& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None) requires(IsIntegral<Integral>);
void add_option(double& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None); void add_option(double& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None);
void add_option(Optional<double>& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None); void add_option(Optional<double>& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None);
void add_option(Optional<size_t>& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None); void add_option(Optional<size_t>& value, char const* help_string, char const* long_name, char short_name, char const* value_name, OptionHideMode hide_mode = OptionHideMode::None);