Skip to content

Refactor code #80

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 #80

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d1633e5
Refactor: change function signature
kkarbowiak Mar 6, 2025
610d72d
Refactor: change function signature
kkarbowiak Mar 6, 2025
c00f88b
Refactor: change function signature
kkarbowiak Mar 7, 2025
334038f
Refactor: change function signature
kkarbowiak Mar 7, 2025
f2f3178
Refactor: change function signature
kkarbowiak Mar 7, 2025
bd92ff1
Refactor: rename function
kkarbowiak Mar 7, 2025
b8fb08d
Refactor: change function signatures
kkarbowiak Mar 7, 2025
8e0aee2
Refactor: construct vector directly
kkarbowiak Mar 7, 2025
0ca9609
Cleanup: call via this pointer to fix Clang error
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
44 changes: 21 additions & 23 deletions include/argparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,11 +868,11 @@ namespace argparse
{
if (has_nargs_number())
{
parse_arguments_number(consumable, std::next(it));
parse_arguments_number(std::ranges::subrange(std::next(it), consumable.end()));
}
else
{
parse_arguments_option(consumable, std::next(it));
parse_arguments_option(std::ranges::subrange(std::next(it), consumable.end()));
}
}
else
Expand Down Expand Up @@ -988,55 +988,55 @@ namespace argparse
}

private:
auto parse_arguments_number(std::ranges::view auto args, auto it) -> void
auto parse_arguments_number(std::ranges::view auto args) -> void
{
auto const nargs_number = get_nargs_number();
auto const args_number = count_args(it, args.end());
auto const args_number = count_args(args);
if (args_number < nargs_number)
{
throw parsing_error(std::format("argument {}: expected {} argument{}", join(get_names(), "/"), std::to_string(nargs_number), nargs_number > 1 ? "s" : ""));
}
parse_arguments_number(it, nargs_number);
parse_arguments(args | std::views::take(nargs_number));
}

auto parse_arguments_option(std::ranges::view auto args, auto it) -> void
auto parse_arguments_option(std::ranges::view auto args) -> void
{
switch (get_nargs_option())
{
case zero_or_one:
{
if (it == args.end() || it->m_token.starts_with("-"))
if (args.empty() || args.front().m_token.starts_with("-"))
{
m_value = m_options.const_;
}
else
{
m_value = consume_arg(*it);
m_value = consume_arg(args.front());
}
break;
}
case zero_or_more:
{
auto const args_number = count_args(it, args.end());
parse_arguments_number(it, args_number);
auto const args_number = count_args(args);
parse_arguments(args | std::views::take(args_number));
break;
}
case one_or_more:
{
auto const args_number = count_args(it, args.end());
auto const args_number = count_args(args);
if (args_number == 0)
{
throw parsing_error(std::format("argument {}: expected at least one argument", join(get_names(), "/")));
}
parse_arguments_number(it, args_number);
parse_arguments(args | std::views::take(args_number));
break;
}
}
}

auto parse_arguments_number(auto it, std::size_t args_number) -> void
auto parse_arguments(std::ranges::view auto args) -> void
{
auto values = consume_args(it, args_number);
auto values = consume_args(args);
m_value = m_options.type_handler->transform(values);
}

Expand Down Expand Up @@ -1114,9 +1114,9 @@ namespace argparse
}
}

auto count_args(auto it, auto end) const -> std::size_t
auto count_args(std::ranges::view auto args) const -> std::size_t
{
return std::ranges::distance(std::ranges::subrange(it, end) | std::views::take_while([](auto const & arg) { return !arg.m_token.starts_with('-'); }));
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
Expand All @@ -1139,14 +1139,12 @@ namespace argparse
return value;
}

auto consume_args(auto arg_it, std::size_t number) const -> std::vector<std::any>
auto consume_args(std::ranges::view auto args) const -> std::vector<std::any>
{
std::vector<std::any> values;
for (std::size_t i = 0; i < number; ++i)
{
values.push_back(consume_arg(*arg_it++));
}
return values;
auto transformation = args
| std::views::transform([this](auto & arg) { return this->consume_arg(arg); })
| std::views::common;
return std::vector(transformation.begin(), transformation.end());
}

auto get_name_for_dest() const -> std::string
Expand Down