From f7b6b2732b8f28e1a9fd0a59bf26796c806c36bd Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Thu, 6 Mar 2025 17:26:41 +0100 Subject: [PATCH 1/5] Refactor: use view pipe syntax --- include/argparse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/argparse.h b/include/argparse.h index f85bd14e..8db5fae0 100644 --- a/include/argparse.h +++ b/include/argparse.h @@ -826,7 +826,7 @@ namespace argparse auto consume_args(std::ranges::view auto args) const -> std::vector { - 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()); } From e2a716559d8fb28e28c7a38119d8b3aa10e28205 Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Thu, 6 Mar 2025 17:27:36 +0100 Subject: [PATCH 2/5] Cleanup: improve formatting --- include/argparse.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/argparse.h b/include/argparse.h index 8db5fae0..a72beef8 100644 --- a/include/argparse.h +++ b/include/argparse.h @@ -826,7 +826,9 @@ namespace argparse auto consume_args(std::ranges::view auto args) const -> std::vector { - auto transformation = args | std::views::transform([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()); } From 0426e2d7b0f6393062c3324ec5015b0d787cab19 Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Thu, 6 Mar 2025 17:33:51 +0100 Subject: [PATCH 3/5] Refactor: use view pipe syntax --- include/argparse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/argparse.h b/include/argparse.h index a72beef8..9a385026 100644 --- a/include/argparse.h +++ b/include/argparse.h @@ -529,7 +529,7 @@ namespace argparse auto transform(std::vector const & values) const -> std::any override { - auto const transformation = std::views::transform(values, [](auto const & value) { return std::any_cast(value); }); + auto const transformation = values | std::views::transform([](auto const & value) { return std::any_cast(value); }); return std::any(std::vector(transformation.begin(), transformation.end())); } From 10588dae1057cad22a54d8a982c4f973165e3961 Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Thu, 6 Mar 2025 17:37:16 +0100 Subject: [PATCH 4/5] Refactor: use view pipe syntax --- include/argparse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/argparse.h b/include/argparse.h index 9a385026..10d30f86 100644 --- a/include/argparse.h +++ b/include/argparse.h @@ -408,7 +408,7 @@ namespace argparse 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; }), " "))); From 00cc1ce3344f3138c5e7cde449242361108104c1 Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Thu, 6 Mar 2025 17:40:16 +0100 Subject: [PATCH 5/5] Cleanup: improve formatting --- include/argparse.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/argparse.h b/include/argparse.h index 10d30f86..43ba3758 100644 --- a/include/argparse.h +++ b/include/argparse.h @@ -400,7 +400,8 @@ 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; } @@ -408,7 +409,8 @@ namespace argparse auto ensure_no_unrecognised_arguments(tokens const & args) const -> void { - auto unconsumed = args | std::views::filter([](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; }), " "))); @@ -529,7 +531,8 @@ namespace argparse auto transform(std::vector const & values) const -> std::any override { - auto const transformation = values | std::views::transform([](auto const & value) { return std::any_cast(value); }); + auto const transformation = values + | std::views::transform([](auto const & value) { return std::any_cast(value); }); return std::any(std::vector(transformation.begin(), transformation.end())); }