Skip to content

Refactor code #185

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 7 commits into from
Dec 3, 2025
Merged

Refactor code #185

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
32b50c9
Replace lambda with member pointer
kkarbowiak Dec 3, 2025
09ff26e
Replace lambda with member pointer
kkarbowiak Dec 3, 2025
bdd1c41
Replace lambda with member pointer
kkarbowiak Dec 3, 2025
c448b17
Replace lambda with member pointer
kkarbowiak Dec 3, 2025
00ea245
Replace lambda with member function pointer
kkarbowiak Dec 3, 2025
9ce1286
Replace lambda with member function pointer
kkarbowiak Dec 3, 2025
75b7744
Simplify code
kkarbowiak Dec 3, 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
28 changes: 7 additions & 21 deletions include/argparse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ namespace argparse
static auto check_unrecognised_arguments(Tokens const & tokens) -> void
{
auto unconsumed = tokens
| std::views::filter([](auto const & token) { return !token.m_consumed; });
| std::views::filter(std::not_fn(&Token::m_consumed));
if (!unconsumed.empty())
{
throw parsing_error(std::format("unrecognised arguments: {}", join(unconsumed | std::views::transform(&Token::m_token), " ")));
Expand Down Expand Up @@ -1165,14 +1165,8 @@ namespace argparse
static auto get_consumable(Tokens & tokens)
{
return tokens
| std::views::drop_while([](auto const & token)
{
return token.m_consumed;
})
| std::views::take_while([](auto const & token)
{
return !token.m_consumed;
})
| std::views::drop_while(&Token::m_consumed)
| std::views::take_while(std::not_fn(&Token::m_consumed))
| std::views::filter([past_pseudo_arg = false](auto const & token) mutable
{
if (past_pseudo_arg && (token.m_token != "--"))
Expand Down Expand Up @@ -1448,7 +1442,7 @@ namespace argparse
static auto get_consumable(Tokens & tokens)
{
return tokens
| std::views::drop_while([](auto const & token) { return token.m_consumed; })
| std::views::drop_while(&Token::m_consumed)
| std::views::take_while([](auto const & token) { return token.m_token != "--"; });
}

Expand All @@ -1457,15 +1451,7 @@ namespace argparse
return std::ranges::subrange(std::ranges::next(it), consumable.end())
| std::views::take_while([](auto const & token)
{
if (!token.m_token.starts_with("-"))
{
return true;
}
if (ArgumentImpl::is_negative_number(token.m_token))
{
return true;
}
return false;
return !token.m_token.starts_with("-") || ArgumentImpl::is_negative_number(token.m_token);
});
}

Expand Down Expand Up @@ -1718,7 +1704,7 @@ namespace argparse
{
auto usage_text = std::string();

auto non_positionals = arguments | std::views::filter([](auto const & argument) { return !argument.is_positional(); });
auto non_positionals = arguments | std::views::filter(std::not_fn(&Formattable::is_positional));

for (auto it = non_positionals.begin(); it != non_positionals.end(); ++it)
{
Expand Down Expand Up @@ -1795,7 +1781,7 @@ namespace argparse
auto help_text = std::string();

for (auto const & argument : arguments
| std::views::filter([](auto const & argument) { return !argument.is_positional(); }))
| std::views::filter(std::not_fn(&Formattable::is_positional)))
{
auto help_line = std::string(" ");
auto const formatted_arg = format(argument);
Expand Down