Skip to content

Refactor code #78

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

Refactor code #78

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7b6b27
Refactor: use view pipe syntax
kkarbowiak Mar 6, 2025
e2a7165
Cleanup: improve formatting
kkarbowiak Mar 6, 2025
0426e2d
Refactor: use view pipe syntax
kkarbowiak Mar 6, 2025
10588da
Refactor: use view pipe syntax
kkarbowiak Mar 6, 2025
00cc1ce
Cleanup: improve formatting
kkarbowiak Mar 6, 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
13 changes: 9 additions & 4 deletions include/argparse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,15 +400,17 @@ namespace argparse

static auto consume_pseudo_arguments(tokens & args) -> void
{
for (auto & arg : args | std::views::filter([](auto const & arg) { return arg.m_token == "--"; }))
for (auto & arg : args
| std::views::filter([](auto const & arg) { return arg.m_token == "--"; }))
{
arg.m_consumed = true;
}
}

auto ensure_no_unrecognised_arguments(tokens const & args) const -> void
{
auto unconsumed = std::ranges::filter_view(args, [](auto const & token) { return !token.m_consumed; });
auto unconsumed = args
| std::views::filter([](auto const & token) { return !token.m_consumed; });
if (!unconsumed.empty())
{
throw parsing_error(std::format("unrecognised arguments: {}", join(unconsumed | std::views::transform([](auto const & token) { return token.m_token; }), " ")));
Expand Down Expand Up @@ -529,7 +531,8 @@ namespace argparse

auto transform(std::vector<std::any> const & values) const -> std::any override
{
auto const transformation = std::views::transform(values, [](auto const & value) { return std::any_cast<T>(value); });
auto const transformation = values
| std::views::transform([](auto const & value) { return std::any_cast<T>(value); });
return std::any(std::vector(transformation.begin(), transformation.end()));
}

Expand Down Expand Up @@ -826,7 +829,9 @@ namespace argparse

auto consume_args(std::ranges::view auto args) const -> std::vector<std::any>
{
auto transformation = std::views::transform(args, [this](auto & arg) { return consume_arg(arg); }) | std::views::common;
auto transformation = args
| std::views::transform([this](auto & arg) { return consume_arg(arg); })
| std::views::common;
return std::vector(transformation.begin(), transformation.end());
}

Expand Down