Skip to content

Refactor code #178

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
Nov 12, 2025
Merged

Refactor code #178

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0dee98
Refactor: change function signature
kkarbowiak Nov 12, 2025
4275254
Refactor: change function signature
kkarbowiak Nov 12, 2025
29d4b6b
Refactor: change function signature
kkarbowiak Nov 12, 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
44 changes: 23 additions & 21 deletions include/argparse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,11 +844,11 @@ namespace argparse
{
if (impl.has_nargs_number())
{
parse_arguments_number(impl, value, name_for_error, tokens);
value = parse_arguments_number(impl, name_for_error, tokens);
}
else
{
parse_arguments_option(impl, value, name_for_error, tokens);
value = parse_arguments_option(impl, name_for_error, tokens);
}
}
else
Expand Down Expand Up @@ -878,51 +878,50 @@ namespace argparse
}

private:
auto parse_arguments_number(ArgumentImpl const & impl, std::any & value, std::function<std::string()> name_for_error, std::ranges::view auto tokens) const -> void
auto parse_arguments_number(ArgumentImpl const & impl, std::function<std::string()> name_for_error, std::ranges::view auto tokens) const -> std::any
{
auto const nargs_number = impl.get_nargs_number();
auto const values = impl.consume_tokens(tokens | std::views::take(nargs_number), name_for_error);
if (values.size() < nargs_number)
{
throw parsing_error(std::format("argument {}: expected {} argument{}", impl.get_joined_names(), std::to_string(nargs_number), nargs_number > 1 ? "s" : ""));
}
value = impl.get_transformed(values);
return impl.get_transformed(values);
}

auto parse_arguments_option(ArgumentImpl const & impl, std::any & value, std::function<std::string()> name_for_error, std::ranges::view auto tokens) const -> void
auto parse_arguments_option(ArgumentImpl const & impl, std::function<std::string()> name_for_error, std::ranges::view auto tokens) const -> std::any
{
switch (impl.get_nargs_option())
{
case zero_or_one:
{
if (!tokens.empty())
{
value = impl.consume_token(tokens.front(), name_for_error);
return impl.consume_token(tokens.front(), name_for_error);
}
else
{
value = impl.get_const();
return impl.get_const();
}
break;
}
case zero_or_more:
{
value = impl.parse_arguments(tokens, name_for_error);
break;
return impl.parse_arguments(tokens, name_for_error);
}
case one_or_more:
{
if (auto const values = impl.consume_tokens(tokens, name_for_error); !values.empty())
{
value = impl.get_transformed(values);
return impl.get_transformed(values);
}
else
{
throw parsing_error(std::format("argument {}: expected at least one argument", impl.get_joined_names()));
}
break;
}
}

std::unreachable();
}
};

Expand Down Expand Up @@ -1109,36 +1108,39 @@ namespace argparse
class PositionalArgument final : public Argument, public Formattable
{
private:
auto parse_arguments_option(std::ranges::view auto tokens) -> void
auto parse_arguments_option(std::ranges::view auto tokens) -> std::any
{
switch (get_nargs_option())
{
case zero_or_one:
{
if (!tokens.empty())
{
m_value = m_impl.consume_token(tokens.front(), get_name_for_error());
return m_impl.consume_token(tokens.front(), get_name_for_error());
}
else
{
m_value = m_impl.get_default();
return m_impl.get_default();
}
break;
}
case zero_or_more:
{
m_value = m_impl.parse_arguments(tokens, get_name_for_error());
break;
return m_impl.parse_arguments(tokens, get_name_for_error());
}
case one_or_more:
{
if (auto const values = m_impl.consume_tokens(tokens, get_name_for_error()); !values.empty())
{
m_value = m_impl.get_transformed(values);
return m_impl.get_transformed(values);
}
else
{
return std::any();
}
break;
}
}

std::unreachable();
}

auto get_name_for_error() const -> std::function<std::string()>
Expand Down Expand Up @@ -1202,7 +1204,7 @@ namespace argparse
}
else
{
parse_arguments_option(consumable);
m_value = parse_arguments_option(consumable);
}
}
else
Expand Down