Skip to content

Commit 100c41b

Browse files
kkarbowiakkkarbowiak
authored
Merge pull request #149 from kkarbowiak/cleanup
Clean up code
2 parents 1c9a9be + e6274f2 commit 100c41b

1 file changed

Lines changed: 44 additions & 44 deletions

File tree

‎include/argparse.hpp‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,13 @@ namespace argparse
385385
for (auto & argument : arguments
386386
| std::views::filter([](auto const & arg) { return !arg.is_positional() && arg.expects_argument(); }))
387387
{
388-
argument.parse_args(tokens);
388+
argument.parse_tokens(tokens);
389389
}
390390

391391
for (auto & argument : arguments
392392
| std::views::filter([](auto const & arg) { return !arg.is_positional() && !arg.expects_argument(); }))
393393
{
394-
argument.parse_args(tokens);
394+
argument.parse_tokens(tokens);
395395
}
396396
}
397397

@@ -400,7 +400,7 @@ namespace argparse
400400
for (auto & argument : arguments
401401
| std::views::filter(&Argument::is_positional))
402402
{
403-
argument.parse_args(tokens);
403+
argument.parse_tokens(tokens);
404404
}
405405
}
406406

@@ -571,7 +571,7 @@ namespace argparse
571571
class Argument
572572
{
573573
public:
574-
virtual auto parse_args(Tokens & tokens) -> void = 0;
574+
virtual auto parse_tokens(Tokens & tokens) -> void = 0;
575575
virtual auto is_positional() const -> bool = 0;
576576
virtual auto is_present() const -> bool = 0;
577577
virtual auto is_required() const -> bool = 0;
@@ -786,39 +786,39 @@ namespace argparse
786786
protected:
787787
virtual auto get_name_for_error() const -> std::string = 0;
788788

789-
auto parse_arguments(std::ranges::view auto args) -> std::any
789+
auto parse_arguments(std::ranges::view auto tokens) -> std::any
790790
{
791-
auto const values = consume_args(args);
791+
auto const values = consume_tokens(tokens);
792792
return get_type_handler().transform(values);
793793
}
794794

795-
auto consume_arg(Token & arg) const -> std::any
795+
auto consume_token(Token & token) const -> std::any
796796
{
797-
arg.m_consumed = true;
798-
return process_arg(arg.m_token);
797+
token.m_consumed = true;
798+
return process_token(token.m_token);
799799
}
800800

801-
auto process_arg(std::string const & arg) const -> std::any
801+
auto process_token(std::string const & token) const -> std::any
802802
{
803-
auto const value = get_type_handler().from_string(arg);
803+
auto const value = get_type_handler().from_string(token);
804804
if (!value.has_value())
805805
{
806-
throw parsing_error(std::format("argument {}: invalid value: '{}'", get_name_for_error(), arg));
806+
throw parsing_error(std::format("argument {}: invalid value: '{}'", get_name_for_error(), token));
807807
}
808808
check_choices(value);
809809
return value;
810810
}
811811

812-
auto consume_args(std::ranges::view auto args) const -> std::vector<std::any>
812+
auto consume_tokens(std::ranges::view auto tokens) const -> std::vector<std::any>
813813
{
814814
auto result = std::vector<std::any>();
815815
auto consumed = std::vector<Token *>();
816-
for (auto & arg : args)
816+
for (auto & token : tokens)
817817
{
818-
result.push_back(process_arg(arg.m_token));
819-
consumed.push_back(&arg);
818+
result.push_back(process_token(token.m_token));
819+
consumed.push_back(&token);
820820
}
821-
std::ranges::for_each(consumed, [](auto arg) { arg->m_consumed = true; });
821+
std::ranges::for_each(consumed, [](auto token) { token->m_consumed = true; });
822822
return result;
823823
}
824824

@@ -861,15 +861,15 @@ namespace argparse
861861
class PositionalArgument final : public ArgumentCommon
862862
{
863863
private:
864-
auto parse_arguments_option(std::ranges::view auto args) -> void
864+
auto parse_arguments_option(std::ranges::view auto tokens) -> void
865865
{
866866
switch (get_nargs_option())
867867
{
868868
case zero_or_one:
869869
{
870-
if (!args.empty())
870+
if (!tokens.empty())
871871
{
872-
m_value = consume_arg(args.front());
872+
m_value = consume_token(tokens.front());
873873
}
874874
else
875875
{
@@ -879,12 +879,12 @@ namespace argparse
879879
}
880880
case zero_or_more:
881881
{
882-
m_value = parse_arguments(args);
882+
m_value = parse_arguments(tokens);
883883
break;
884884
}
885885
case one_or_more:
886886
{
887-
if (auto const values = consume_args(args); !values.empty())
887+
if (auto const values = consume_tokens(tokens); !values.empty())
888888
{
889889
m_value = get_transformed(values);
890890
}
@@ -930,7 +930,7 @@ namespace argparse
930930
{
931931
}
932932

933-
auto parse_args(Tokens & tokens) -> void override
933+
auto parse_tokens(Tokens & tokens) -> void override
934934
{
935935
auto consumable = get_consumable(tokens);
936936

@@ -949,7 +949,7 @@ namespace argparse
949949
{
950950
if (!consumable.empty())
951951
{
952-
m_value = consume_arg(consumable.front());
952+
m_value = consume_token(consumable.front());
953953
}
954954
}
955955
}
@@ -1002,7 +1002,7 @@ namespace argparse
10021002
class OptionalArgument final : public ArgumentCommon
10031003
{
10041004
private:
1005-
auto perform_action(std::string const & value, std::ranges::view auto args) -> void
1005+
auto perform_action(std::string const & value, std::ranges::view auto tokens) -> void
10061006
{
10071007
switch (get_action())
10081008
{
@@ -1011,22 +1011,22 @@ namespace argparse
10111011
{
10121012
if (has_nargs_number())
10131013
{
1014-
parse_arguments_number(args);
1014+
parse_arguments_number(tokens);
10151015
}
10161016
else
10171017
{
1018-
parse_arguments_option(args);
1018+
parse_arguments_option(tokens);
10191019
}
10201020
}
10211021
else
10221022
{
10231023
if (value.empty())
10241024
{
1025-
m_value = consume_arg(args.front());
1025+
m_value = consume_token(tokens.front());
10261026
}
10271027
else
10281028
{
1029-
m_value = process_arg(value);
1029+
m_value = process_token(value);
10301030
}
10311031
}
10321032
break;
@@ -1054,25 +1054,25 @@ namespace argparse
10541054
{
10551055
if (!m_value.has_value())
10561056
{
1057-
auto const values = consume_args(args | std::views::take(1));
1057+
auto const values = consume_tokens(tokens | std::views::take(1));
10581058
m_value = get_transformed(values);
10591059
}
10601060
else
10611061
{
1062-
auto const val = consume_arg(args.front());
1062+
auto const val = consume_token(tokens.front());
10631063
append_value(val, m_value);
10641064
}
10651065
}
10661066
else
10671067
{
10681068
if (!m_value.has_value())
10691069
{
1070-
auto const values = consume_args(std::views::single(Token{value}));
1070+
auto const values = consume_tokens(std::views::single(Token{value}));
10711071
m_value = get_transformed(values);
10721072
}
10731073
else
10741074
{
1075-
auto const val = process_arg(value);
1075+
auto const val = process_token(value);
10761076
append_value(val, m_value);
10771077
}
10781078
}
@@ -1086,41 +1086,41 @@ namespace argparse
10861086
}
10871087
}
10881088

1089-
auto parse_arguments_number(std::ranges::view auto args) -> void
1089+
auto parse_arguments_number(std::ranges::view auto tokens) -> void
10901090
{
10911091
auto const nargs_number = get_nargs_number();
1092-
auto const values = consume_args(args | std::views::take(nargs_number));
1092+
auto const values = consume_tokens(tokens | std::views::take(nargs_number));
10931093
if (values.size() < nargs_number)
10941094
{
10951095
throw parsing_error(std::format("argument {}: expected {} argument{}", get_joined_names(), std::to_string(nargs_number), nargs_number > 1 ? "s" : ""));
10961096
}
10971097
m_value = get_transformed(values);
10981098
}
10991099

1100-
auto parse_arguments_option(std::ranges::view auto args) -> void
1100+
auto parse_arguments_option(std::ranges::view auto tokens) -> void
11011101
{
11021102
switch (get_nargs_option())
11031103
{
11041104
case zero_or_one:
11051105
{
1106-
if (args.empty())
1106+
if (tokens.empty())
11071107
{
11081108
m_value = get_const();
11091109
}
11101110
else
11111111
{
1112-
m_value = consume_arg(args.front());
1112+
m_value = consume_token(tokens.front());
11131113
}
11141114
break;
11151115
}
11161116
case zero_or_more:
11171117
{
1118-
m_value = parse_arguments(args);
1118+
m_value = parse_arguments(tokens);
11191119
break;
11201120
}
11211121
case one_or_more:
11221122
{
1123-
auto const values = consume_args(args);
1123+
auto const values = consume_tokens(tokens);
11241124
if (values.empty())
11251125
{
11261126
throw parsing_error(std::format("argument {}: expected at least one argument", get_joined_names()));
@@ -1223,12 +1223,12 @@ namespace argparse
12231223
return get_joined_names();
12241224
}
12251225

1226-
auto check_errors(std::string const & value, std::ranges::view auto args) const -> void
1226+
auto check_errors(std::string const & value, std::ranges::view auto tokens) const -> void
12271227
{
12281228
switch (get_action())
12291229
{
12301230
case store:
1231-
if (!has_nargs() && value.empty() && args.empty())
1231+
if (!has_nargs() && value.empty() && tokens.empty())
12321232
{
12331233
throw parsing_error(std::format("argument {}: expected one argument", get_joined_names()));
12341234
}
@@ -1243,7 +1243,7 @@ namespace argparse
12431243
}
12441244
break;
12451245
case append:
1246-
if (value.empty() && args.empty())
1246+
if (value.empty() && tokens.empty())
12471247
{
12481248
throw parsing_error(std::format("argument {}: expected one argument", get_joined_names()));
12491249
}
@@ -1298,7 +1298,7 @@ namespace argparse
12981298
{
12991299
}
13001300

1301-
auto parse_args(Tokens & tokens) -> void override
1301+
auto parse_tokens(Tokens & tokens) -> void override
13021302
{
13031303
auto consumable = get_consumable(tokens);
13041304

0 commit comments

Comments
 (0)