Skip to content

Refactor code #88

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

Merged
kkarbowiak merged 3 commits into from
Mar 14, 2025
Merged

Refactor code #88

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
924b1f1
Add convenience function
kkarbowiak Mar 14, 2025
cb2936b
Use the function
kkarbowiak Mar 14, 2025
4bc7feb
Extract common code to base class
kkarbowiak Mar 14, 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
96 changes: 39 additions & 57 deletions include/argparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,38 @@ namespace argparse
}

protected:
virtual auto get_name_for_error() const -> std::string = 0;

auto consume_arg(Token & arg) const -> std::any
{
arg.m_consumed = true;
return process_arg(arg.m_token);
}

auto process_arg(std::string const & arg) const -> std::any
{
std::any value;
if (!m_options.type_handler->from_string(arg, value))
{
throw parsing_error(std::format("argument {}: invalid value: '{}'", get_name_for_error(), arg));
}
check_choices(value);
return value;
}

auto consume_args(std::ranges::view auto args) const -> std::vector<std::any>
{
auto result = std::vector<std::any>();
auto consumed = std::vector<Token *>();
for (auto & arg : args)
{
result.push_back(process_arg(arg.m_token));
consumed.push_back(&arg);
}
std::ranges::for_each(consumed, [](auto arg) { arg->m_consumed = true; });
return result;
}

auto check_choices(std::any const & value) const -> void
{
if (m_options.choices.empty())
Expand Down Expand Up @@ -792,34 +824,9 @@ namespace argparse
}
}

auto consume_arg(Token & arg) const -> std::any
{
arg.m_consumed = true;
return process_arg(arg.m_token);
}

auto process_arg(std::string const & arg) const -> std::any
{
std::any value;
if (!m_options.type_handler->from_string(arg, value))
{
throw parsing_error(std::format("argument {}: invalid value: '{}'", get_dest_name(), arg));
}
check_choices(value);
return value;
}

auto consume_args(std::ranges::view auto args) const -> std::vector<std::any>
auto get_name_for_error() const -> std::string override
{
auto result = std::vector<std::any>();
auto consumed = std::vector<Token *>();
for (auto & arg : args)
{
result.push_back(process_arg(arg.m_token));
consumed.push_back(&arg);
}
std::ranges::for_each(consumed, [](auto arg) { arg->m_consumed = true; });
return result;
return get_dest_name();
}

private:
Expand Down Expand Up @@ -1102,36 +1109,6 @@ namespace argparse
}
}

auto consume_arg(Token & arg) const -> std::any
{
arg.m_consumed = true;
return process_arg(arg.m_token);
}

auto process_arg(std::string const & arg) const -> std::any
{
std::any value;
if (!m_options.type_handler->from_string(arg, value))
{
throw parsing_error(std::format("argument {}: invalid value: '{}'", join(get_names(), "/"), arg));
}
check_choices(value);
return value;
}

auto consume_args(std::ranges::view auto args) const -> std::vector<std::any>
{
auto result = std::vector<std::any>();
auto consumed = std::vector<Token *>();
for (auto & arg : args)
{
result.push_back(process_arg(arg.m_token));
consumed.push_back(&arg);
}
std::ranges::for_each(consumed, [](auto arg) { arg->m_consumed = true; });
return result;
}

auto get_name_for_dest() const -> std::string
{
for (auto const & name : m_options.names)
Expand All @@ -1145,6 +1122,11 @@ namespace argparse
return m_options.names.front().substr(1);
}

auto get_name_for_error() const -> std::string override
{
return join(get_names(), "/");
}

private:
std::any m_value;
bool m_present;
Expand Down