Skip to content

Refactor code #69

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 2 commits into from
Mar 4, 2025
Merged

Refactor code #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e6ea1d
Refactor: change passing args
kkarbowiak Mar 4, 2025
b0d42ad
Refactor: change passing args
kkarbowiak Mar 4, 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
32 changes: 11 additions & 21 deletions include/argparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,9 @@ namespace argparse

auto parse_args(tokens args) -> Parameters
{
args = parse_optional_arguments(std::move(args));
args = remove_pseudo_arguments(std::move(args));
args = parse_positional_arguments(std::move(args));
parse_optional_arguments(args);
remove_pseudo_arguments(args);
parse_positional_arguments(args);

ensure_no_unrecognised_arguments(args);
ensure_no_arguments_excluded();
Expand Down Expand Up @@ -380,33 +380,27 @@ namespace argparse
return result;
}

auto parse_optional_arguments(tokens args) -> tokens
auto parse_optional_arguments(tokens & args) -> void
{
for (auto const & arg : m_arguments
| std::views::filter([](auto && arg){ return !arg->is_positional(); }))
{
args = arg->parse_args(std::move(args));
arg->parse_args(args);
}

return args;
}

auto parse_positional_arguments(tokens args) -> tokens
auto parse_positional_arguments(tokens & args) -> void
{
for (auto const & arg : m_arguments
| std::views::filter([](auto && arg){ return arg->is_positional(); }))
{
args = arg->parse_args(std::move(args));
arg->parse_args(args);
}

return args;
}

static auto remove_pseudo_arguments(tokens args) -> tokens
static auto remove_pseudo_arguments(tokens & args) -> void
{
std::erase(args, Token{"--"});

return args;
}

auto ensure_no_unrecognised_arguments(tokens const & args) const -> void
Expand Down Expand Up @@ -568,7 +562,7 @@ namespace argparse
}
virtual ~Argument() = default;

virtual auto parse_args(tokens args) -> tokens = 0;
virtual auto parse_args(tokens & args) -> void = 0;
virtual auto get_dest_name() const -> std::string = 0;
virtual auto get_metavar_name() const -> std::string = 0;
virtual auto has_value() const -> bool = 0;
Expand Down Expand Up @@ -685,7 +679,7 @@ namespace argparse
{
}

auto parse_args(tokens args) -> tokens override
auto parse_args(tokens & args) -> void override
{
auto consumable = args | std::views::drop_while([](auto const & token) { return token.m_consumed; });
if (has_nargs())
Expand All @@ -706,8 +700,6 @@ namespace argparse
m_value = consume_arg(consumable.front());
}
}

return args;
}

auto get_dest_name() const -> std::string override
Expand Down Expand Up @@ -827,7 +819,7 @@ namespace argparse
{
}

auto parse_args(tokens args) -> tokens override
auto parse_args(tokens & args) -> void override
{
auto consumable = args
| std::views::drop_while([](auto const & token) { return token.m_consumed; })
Expand Down Expand Up @@ -910,8 +902,6 @@ namespace argparse
break;
}
}

return args;
}

auto get_dest_name() const -> std::string override
Expand Down