From 0a7001630970d3d01c30f45093ec2521526f288d Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Fri, 19 Sep 2025 18:20:37 +0200 Subject: [PATCH 1/6] Cleanup: rename function --- include/argparse.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/argparse.hpp b/include/argparse.hpp index 307755f..704ac53 100644 --- a/include/argparse.hpp +++ b/include/argparse.hpp @@ -385,13 +385,13 @@ namespace argparse for (auto & argument : arguments | std::views::filter([](auto const & arg) { return !arg.is_positional() && arg.expects_argument(); })) { - argument.parse_args(tokens); + argument.parse_tokens(tokens); } for (auto & argument : arguments | std::views::filter([](auto const & arg) { return !arg.is_positional() && !arg.expects_argument(); })) { - argument.parse_args(tokens); + argument.parse_tokens(tokens); } } @@ -400,7 +400,7 @@ namespace argparse for (auto & argument : arguments | std::views::filter(&Argument::is_positional)) { - argument.parse_args(tokens); + argument.parse_tokens(tokens); } } @@ -571,7 +571,7 @@ namespace argparse class Argument { public: - virtual auto parse_args(Tokens & tokens) -> void = 0; + virtual auto parse_tokens(Tokens & tokens) -> void = 0; virtual auto is_positional() const -> bool = 0; virtual auto is_present() const -> bool = 0; virtual auto is_required() const -> bool = 0; @@ -930,7 +930,7 @@ namespace argparse { } - auto parse_args(Tokens & tokens) -> void override + auto parse_tokens(Tokens & tokens) -> void override { auto consumable = get_consumable(tokens); @@ -1298,7 +1298,7 @@ namespace argparse { } - auto parse_args(Tokens & tokens) -> void override + auto parse_tokens(Tokens & tokens) -> void override { auto consumable = get_consumable(tokens); From 07f195a9f7a68b4d28b1167d96e41f61021c5b34 Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Fri, 19 Sep 2025 18:39:35 +0200 Subject: [PATCH 2/6] Cleanup: rename function parameters --- include/argparse.hpp | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/include/argparse.hpp b/include/argparse.hpp index 704ac53..0bcb812 100644 --- a/include/argparse.hpp +++ b/include/argparse.hpp @@ -786,16 +786,16 @@ namespace argparse protected: virtual auto get_name_for_error() const -> std::string = 0; - auto parse_arguments(std::ranges::view auto args) -> std::any + auto parse_arguments(std::ranges::view auto tokens) -> std::any { - auto const values = consume_args(args); + auto const values = consume_args(tokens); return get_type_handler().transform(values); } - auto consume_arg(Token & arg) const -> std::any + auto consume_arg(Token & token) const -> std::any { - arg.m_consumed = true; - return process_arg(arg.m_token); + token.m_consumed = true; + return process_arg(token.m_token); } auto process_arg(std::string const & arg) const -> std::any @@ -809,16 +809,16 @@ namespace argparse return value; } - auto consume_args(std::ranges::view auto args) const -> std::vector + auto consume_args(std::ranges::view auto tokens) const -> std::vector { auto result = std::vector(); auto consumed = std::vector(); - for (auto & arg : args) + for (auto & token : tokens) { - result.push_back(process_arg(arg.m_token)); - consumed.push_back(&arg); + result.push_back(process_arg(token.m_token)); + consumed.push_back(&token); } - std::ranges::for_each(consumed, [](auto arg) { arg->m_consumed = true; }); + std::ranges::for_each(consumed, [](auto token) { token->m_consumed = true; }); return result; } @@ -861,15 +861,15 @@ namespace argparse class PositionalArgument final : public ArgumentCommon { private: - auto parse_arguments_option(std::ranges::view auto args) -> void + auto parse_arguments_option(std::ranges::view auto tokens) -> void { switch (get_nargs_option()) { case zero_or_one: { - if (!args.empty()) + if (!tokens.empty()) { - m_value = consume_arg(args.front()); + m_value = consume_arg(tokens.front()); } else { @@ -879,12 +879,12 @@ namespace argparse } case zero_or_more: { - m_value = parse_arguments(args); + m_value = parse_arguments(tokens); break; } case one_or_more: { - if (auto const values = consume_args(args); !values.empty()) + if (auto const values = consume_args(tokens); !values.empty()) { m_value = get_transformed(values); } @@ -1002,7 +1002,7 @@ namespace argparse class OptionalArgument final : public ArgumentCommon { private: - auto perform_action(std::string const & value, std::ranges::view auto args) -> void + auto perform_action(std::string const & value, std::ranges::view auto tokens) -> void { switch (get_action()) { @@ -1011,18 +1011,18 @@ namespace argparse { if (has_nargs_number()) { - parse_arguments_number(args); + parse_arguments_number(tokens); } else { - parse_arguments_option(args); + parse_arguments_option(tokens); } } else { if (value.empty()) { - m_value = consume_arg(args.front()); + m_value = consume_arg(tokens.front()); } else { @@ -1054,12 +1054,12 @@ namespace argparse { if (!m_value.has_value()) { - auto const values = consume_args(args | std::views::take(1)); + auto const values = consume_args(tokens | std::views::take(1)); m_value = get_transformed(values); } else { - auto const val = consume_arg(args.front()); + auto const val = consume_arg(tokens.front()); append_value(val, m_value); } } @@ -1086,10 +1086,10 @@ namespace argparse } } - auto parse_arguments_number(std::ranges::view auto args) -> void + auto parse_arguments_number(std::ranges::view auto tokens) -> void { auto const nargs_number = get_nargs_number(); - auto const values = consume_args(args | std::views::take(nargs_number)); + auto const values = consume_args(tokens | std::views::take(nargs_number)); if (values.size() < nargs_number) { throw parsing_error(std::format("argument {}: expected {} argument{}", get_joined_names(), std::to_string(nargs_number), nargs_number > 1 ? "s" : "")); @@ -1097,30 +1097,30 @@ namespace argparse m_value = get_transformed(values); } - auto parse_arguments_option(std::ranges::view auto args) -> void + auto parse_arguments_option(std::ranges::view auto tokens) -> void { switch (get_nargs_option()) { case zero_or_one: { - if (args.empty()) + if (tokens.empty()) { m_value = get_const(); } else { - m_value = consume_arg(args.front()); + m_value = consume_arg(tokens.front()); } break; } case zero_or_more: { - m_value = parse_arguments(args); + m_value = parse_arguments(tokens); break; } case one_or_more: { - auto const values = consume_args(args); + auto const values = consume_args(tokens); if (values.empty()) { throw parsing_error(std::format("argument {}: expected at least one argument", get_joined_names())); @@ -1223,12 +1223,12 @@ namespace argparse return get_joined_names(); } - auto check_errors(std::string const & value, std::ranges::view auto args) const -> void + auto check_errors(std::string const & value, std::ranges::view auto tokens) const -> void { switch (get_action()) { case store: - if (!has_nargs() && value.empty() && args.empty()) + if (!has_nargs() && value.empty() && tokens.empty()) { throw parsing_error(std::format("argument {}: expected one argument", get_joined_names())); } @@ -1243,7 +1243,7 @@ namespace argparse } break; case append: - if (value.empty() && args.empty()) + if (value.empty() && tokens.empty()) { throw parsing_error(std::format("argument {}: expected one argument", get_joined_names())); } From e470d47e68f585f8cffff17151b3fa52b88692c0 Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Fri, 19 Sep 2025 18:43:59 +0200 Subject: [PATCH 3/6] Cleanup: rename function --- include/argparse.hpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/argparse.hpp b/include/argparse.hpp index 0bcb812..8cec28e 100644 --- a/include/argparse.hpp +++ b/include/argparse.hpp @@ -788,7 +788,7 @@ namespace argparse auto parse_arguments(std::ranges::view auto tokens) -> std::any { - auto const values = consume_args(tokens); + auto const values = consume_tokens(tokens); return get_type_handler().transform(values); } @@ -809,7 +809,7 @@ namespace argparse return value; } - auto consume_args(std::ranges::view auto tokens) const -> std::vector + auto consume_tokens(std::ranges::view auto tokens) const -> std::vector { auto result = std::vector(); auto consumed = std::vector(); @@ -884,7 +884,7 @@ namespace argparse } case one_or_more: { - if (auto const values = consume_args(tokens); !values.empty()) + if (auto const values = consume_tokens(tokens); !values.empty()) { m_value = get_transformed(values); } @@ -1054,7 +1054,7 @@ namespace argparse { if (!m_value.has_value()) { - auto const values = consume_args(tokens | std::views::take(1)); + auto const values = consume_tokens(tokens | std::views::take(1)); m_value = get_transformed(values); } else @@ -1067,7 +1067,7 @@ namespace argparse { if (!m_value.has_value()) { - auto const values = consume_args(std::views::single(Token{value})); + auto const values = consume_tokens(std::views::single(Token{value})); m_value = get_transformed(values); } else @@ -1089,7 +1089,7 @@ namespace argparse auto parse_arguments_number(std::ranges::view auto tokens) -> void { auto const nargs_number = get_nargs_number(); - auto const values = consume_args(tokens | std::views::take(nargs_number)); + auto const values = consume_tokens(tokens | std::views::take(nargs_number)); if (values.size() < nargs_number) { throw parsing_error(std::format("argument {}: expected {} argument{}", get_joined_names(), std::to_string(nargs_number), nargs_number > 1 ? "s" : "")); @@ -1120,7 +1120,7 @@ namespace argparse } case one_or_more: { - auto const values = consume_args(tokens); + auto const values = consume_tokens(tokens); if (values.empty()) { throw parsing_error(std::format("argument {}: expected at least one argument", get_joined_names())); From 18e696bef1d609783ba95c2c2aef796ca9b4f722 Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Fri, 19 Sep 2025 18:46:24 +0200 Subject: [PATCH 4/6] Cleanup: rename function --- include/argparse.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/argparse.hpp b/include/argparse.hpp index 8cec28e..b5452c6 100644 --- a/include/argparse.hpp +++ b/include/argparse.hpp @@ -792,7 +792,7 @@ namespace argparse return get_type_handler().transform(values); } - auto consume_arg(Token & token) const -> std::any + auto consume_token(Token & token) const -> std::any { token.m_consumed = true; return process_arg(token.m_token); @@ -869,7 +869,7 @@ namespace argparse { if (!tokens.empty()) { - m_value = consume_arg(tokens.front()); + m_value = consume_token(tokens.front()); } else { @@ -949,7 +949,7 @@ namespace argparse { if (!consumable.empty()) { - m_value = consume_arg(consumable.front()); + m_value = consume_token(consumable.front()); } } } @@ -1022,7 +1022,7 @@ namespace argparse { if (value.empty()) { - m_value = consume_arg(tokens.front()); + m_value = consume_token(tokens.front()); } else { @@ -1059,7 +1059,7 @@ namespace argparse } else { - auto const val = consume_arg(tokens.front()); + auto const val = consume_token(tokens.front()); append_value(val, m_value); } } @@ -1109,7 +1109,7 @@ namespace argparse } else { - m_value = consume_arg(tokens.front()); + m_value = consume_token(tokens.front()); } break; } From 6e7b8a6d8ef76ff3171a74a8aa1902dff6386771 Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Fri, 19 Sep 2025 18:49:53 +0200 Subject: [PATCH 5/6] Cleanup: rename function --- include/argparse.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/argparse.hpp b/include/argparse.hpp index b5452c6..dc4b901 100644 --- a/include/argparse.hpp +++ b/include/argparse.hpp @@ -795,10 +795,10 @@ namespace argparse auto consume_token(Token & token) const -> std::any { token.m_consumed = true; - return process_arg(token.m_token); + return process_token(token.m_token); } - auto process_arg(std::string const & arg) const -> std::any + auto process_token(std::string const & arg) const -> std::any { auto const value = get_type_handler().from_string(arg); if (!value.has_value()) @@ -815,7 +815,7 @@ namespace argparse auto consumed = std::vector(); for (auto & token : tokens) { - result.push_back(process_arg(token.m_token)); + result.push_back(process_token(token.m_token)); consumed.push_back(&token); } std::ranges::for_each(consumed, [](auto token) { token->m_consumed = true; }); @@ -1026,7 +1026,7 @@ namespace argparse } else { - m_value = process_arg(value); + m_value = process_token(value); } } break; @@ -1072,7 +1072,7 @@ namespace argparse } else { - auto const val = process_arg(value); + auto const val = process_token(value); append_value(val, m_value); } } From e6274f2c72088c1f7d1eeb9454b1c3d63ac1088d Mon Sep 17 00:00:00 2001 From: Krzysiek Karbowiak Date: Fri, 19 Sep 2025 18:53:04 +0200 Subject: [PATCH 6/6] Cleanup: rename function parameter --- include/argparse.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/argparse.hpp b/include/argparse.hpp index dc4b901..4b2b28c 100644 --- a/include/argparse.hpp +++ b/include/argparse.hpp @@ -798,12 +798,12 @@ namespace argparse return process_token(token.m_token); } - auto process_token(std::string const & arg) const -> std::any + auto process_token(std::string const & token) const -> std::any { - auto const value = get_type_handler().from_string(arg); + auto const value = get_type_handler().from_string(token); if (!value.has_value()) { - throw parsing_error(std::format("argument {}: invalid value: '{}'", get_name_for_error(), arg)); + throw parsing_error(std::format("argument {}: invalid value: '{}'", get_name_for_error(), token)); } check_choices(value); return value;