Skip to content

Refactor code #82

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

Refactor code #82

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a2f66ff
Refactor: extract view to local variable
kkarbowiak Mar 7, 2025
514dd81
Refactor: simplify code
kkarbowiak Mar 7, 2025
d2f22c2
Refactor: simplify code
kkarbowiak Mar 7, 2025
3096d24
Refactor: move args filtering into view
kkarbowiak Mar 7, 2025
df21e1d
Refactor: remove no longer needed arguments counting
kkarbowiak Mar 7, 2025
492ab0c
Refactor: remove arguments counting
kkarbowiak Mar 7, 2025
d27c6d9
Refactor: remove arguments counting
kkarbowiak Mar 7, 2025
42577bd
Cleanup: remove no longer used function
kkarbowiak Mar 7, 2025
bc44ae7
Cleanup: add const qualifiers
kkarbowiak Mar 7, 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
38 changes: 17 additions & 21 deletions include/argparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ namespace argparse
private:
auto parse_arguments(std::ranges::view auto args) -> void
{
auto values = consume_args(args);
auto const values = consume_args(args);

m_value = m_options.type_handler->transform(values);
}
Expand Down Expand Up @@ -802,7 +802,7 @@ namespace argparse
}
case one_or_more:
{
auto values = consume_args(args);
auto const values = consume_args(args);
if (!values.empty())
{
m_value = m_options.type_handler->transform(values);
Expand Down Expand Up @@ -860,6 +860,8 @@ namespace argparse
if (auto [found, name] = has_arg(it); found)
{
auto const value = consume_name(it, name);
auto consumable_args = std::ranges::subrange(std::next(it), consumable.end())
| std::views::take_while([](auto const & token) { return !token.m_token.starts_with("-"); });

switch (m_options.action)
{
Expand All @@ -868,24 +870,24 @@ namespace argparse
{
if (has_nargs_number())
{
parse_arguments_number(std::ranges::subrange(std::next(it), consumable.end()));
parse_arguments_number(consumable_args);
}
else
{
parse_arguments_option(std::ranges::subrange(std::next(it), consumable.end()));
parse_arguments_option(consumable_args);
}
}
else
{
if (value.empty())
{
if (auto nit = std::next(it); (nit == consumable.end()) || nit->m_token.starts_with("-"))
if (consumable_args.empty())
{
throw parsing_error(std::format("argument {}: expected one argument", join(get_names(), "/")));
}
else
{
m_value = consume_arg(*nit);
m_value = consume_arg(consumable_args.front());
}
}
else
Expand Down Expand Up @@ -991,12 +993,12 @@ namespace argparse
auto parse_arguments_number(std::ranges::view auto args) -> void
{
auto const nargs_number = get_nargs_number();
auto const args_number = count_args(args);
if (args_number < nargs_number)
auto const values = consume_args(args | std::views::take(nargs_number));
if (values.size() < nargs_number)
{
throw parsing_error(std::format("argument {}: expected {} argument{}", join(get_names(), "/"), std::to_string(nargs_number), nargs_number > 1 ? "s" : ""));
}
parse_arguments(args | std::views::take(nargs_number));
m_value = m_options.type_handler->transform(values);
}

auto parse_arguments_option(std::ranges::view auto args) -> void
Expand All @@ -1005,7 +1007,7 @@ namespace argparse
{
case zero_or_one:
{
if (args.empty() || args.front().m_token.starts_with("-"))
if (args.empty())
{
m_value = m_options.const_;
}
Expand All @@ -1017,26 +1019,25 @@ namespace argparse
}
case zero_or_more:
{
auto const args_number = count_args(args);
parse_arguments(args | std::views::take(args_number));
parse_arguments(args);
break;
}
case one_or_more:
{
auto const args_number = count_args(args);
if (args_number == 0)
auto const values = consume_args(args);
if (values.empty())
{
throw parsing_error(std::format("argument {}: expected at least one argument", join(get_names(), "/")));
}
parse_arguments(args | std::views::take(args_number));
m_value = m_options.type_handler->transform(values);
break;
}
}
}

auto parse_arguments(std::ranges::view auto args) -> void
{
auto values = consume_args(args);
auto const values = consume_args(args);
m_value = m_options.type_handler->transform(values);
}

Expand Down Expand Up @@ -1114,11 +1115,6 @@ namespace argparse
}
}

auto count_args(std::ranges::view auto args) const -> std::size_t
{
return std::ranges::distance(args | std::views::take_while([](auto const & arg) { return !arg.m_token.starts_with('-'); }));
}

auto consume_arg(Token & arg) const -> std::any
{
arg.m_consumed = true;
Expand Down