Skip to content

Commit 17785a0

Browse files
kkarbowiakkkarbowiak
authored
Merge pull request #146 from kkarbowiak/cleanup
Clean up code
2 parents 67eb208 + 901effc commit 17785a0

1 file changed

Lines changed: 50 additions & 50 deletions

File tree

‎include/argparse.hpp‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ namespace argparse
196196
bool m_consumed = false;
197197
};
198198

199-
using tokens = std::vector<Token>;
200-
using optstring = std::optional<std::string>;
199+
using Tokens = std::vector<Token>;
200+
using OptString = std::optional<std::string>;
201201

202202
class HelpRequested {};
203203
class VersionRequested {};
@@ -337,24 +337,24 @@ namespace argparse
337337
return path;
338338
}
339339

340-
auto parse_args(tokens args) -> Parameters
340+
auto parse_args(Tokens tokens) -> Parameters
341341
{
342342
auto arguments = m_arguments | std::views::transform([](auto const & up) -> Argument & { return *up; });
343-
parse_optional_arguments(arguments, args);
344-
parse_positional_arguments(arguments, args);
343+
parse_optional_arguments(arguments, tokens);
344+
parse_positional_arguments(arguments, tokens);
345345

346-
consume_pseudo_arguments(args);
346+
consume_pseudo_arguments(tokens);
347347

348-
check_unrecognised_arguments(args);
348+
check_unrecognised_arguments(tokens);
349349
check_excluded_arguments(arguments);
350350
check_missing_arguments(arguments);
351351

352352
return get_parameters(arguments);
353353
}
354354

355-
static auto get_tokens(int argc, char const * const argv[]) -> tokens
355+
static auto get_tokens(int argc, char const * const argv[]) -> Tokens
356356
{
357-
return tokens(&argv[1], &argv[argc]);
357+
return Tokens(&argv[1], &argv[argc]);
358358
}
359359

360360
static auto join(std::vector<std::string> const & strings, std::string_view separator) -> std::string
@@ -379,42 +379,42 @@ namespace argparse
379379
return result;
380380
}
381381

382-
auto parse_optional_arguments(std::ranges::view auto arguments, tokens & args) -> void
382+
auto parse_optional_arguments(std::ranges::view auto arguments, Tokens & tokens) -> void
383383
{
384384
for (auto & argument : arguments
385385
| std::views::filter([](auto const & arg) { return !arg.is_positional() && arg.expects_argument(); }))
386386
{
387-
argument.parse_args(args);
387+
argument.parse_args(tokens);
388388
}
389389

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

397-
auto parse_positional_arguments(std::ranges::view auto arguments, tokens & args) -> void
397+
auto parse_positional_arguments(std::ranges::view auto arguments, Tokens & tokens) -> void
398398
{
399399
for (auto & argument : arguments
400400
| std::views::filter(&Argument::is_positional))
401401
{
402-
argument.parse_args(args);
402+
argument.parse_args(tokens);
403403
}
404404
}
405405

406-
static auto consume_pseudo_arguments(tokens & args) -> void
406+
static auto consume_pseudo_arguments(Tokens & tokens) -> void
407407
{
408-
for (auto & arg : args
409-
| std::views::filter([](auto const & arg) { return arg.m_token == "--"; }))
408+
for (auto & token : tokens
409+
| std::views::filter([](auto const & t) { return t.m_token == "--"; }))
410410
{
411-
arg.m_consumed = true;
411+
token.m_consumed = true;
412412
}
413413
}
414414

415-
auto check_unrecognised_arguments(tokens const & args) const -> void
415+
auto check_unrecognised_arguments(Tokens const & tokens) const -> void
416416
{
417-
auto unconsumed = args
417+
auto unconsumed = tokens
418418
| std::views::filter([](auto const & token) { return !token.m_consumed; });
419419
if (!unconsumed.empty())
420420
{
@@ -439,7 +439,7 @@ namespace argparse
439439

440440
auto check_missing_arguments(std::ranges::view auto arguments) const -> void
441441
{
442-
auto error_message = optstring();
442+
auto error_message = OptString();
443443

444444
for (auto const & argument : arguments
445445
| std::views::filter([](auto const & arg) { return arg.is_required() && !arg.has_value(); }))
@@ -472,7 +472,7 @@ namespace argparse
472472
return result;
473473
}
474474

475-
static auto replace_prog(std::string text, optstring const & replacement) -> std::string
475+
static auto replace_prog(std::string text, OptString const & replacement) -> std::string
476476
{
477477
if (!replacement)
478478
{
@@ -569,7 +569,7 @@ namespace argparse
569569
class Argument
570570
{
571571
public:
572-
virtual auto parse_args(tokens & args) -> void = 0;
572+
virtual auto parse_args(Tokens & tokens) -> void = 0;
573573
virtual auto is_positional() const -> bool = 0;
574574
virtual auto is_present() const -> bool = 0;
575575
virtual auto is_required() const -> bool = 0;
@@ -896,9 +896,9 @@ namespace argparse
896896
return get_dest_name();
897897
}
898898

899-
auto get_consumable(tokens & args) const
899+
auto get_consumable(Tokens & tokens) const
900900
{
901-
return args
901+
return tokens
902902
| std::views::drop_while([](auto const & token)
903903
{
904904
return token.m_consumed;
@@ -928,9 +928,9 @@ namespace argparse
928928
{
929929
}
930930

931-
auto parse_args(tokens & args) -> void override
931+
auto parse_args(Tokens & tokens) -> void override
932932
{
933-
auto consumable = get_consumable(args);
933+
auto consumable = get_consumable(tokens);
934934

935935
if (has_nargs())
936936
{
@@ -1273,9 +1273,9 @@ namespace argparse
12731273
}
12741274
}
12751275

1276-
auto get_consumable(tokens & args) const
1276+
auto get_consumable(Tokens & tokens) const
12771277
{
1278-
return args
1278+
return tokens
12791279
| std::views::drop_while([](auto const & token) { return token.m_consumed; })
12801280
| std::views::take_while([](auto const & token) { return token.m_token != "--"; });
12811281
}
@@ -1296,9 +1296,9 @@ namespace argparse
12961296
{
12971297
}
12981298

1299-
auto parse_args(tokens & args) -> void override
1299+
auto parse_args(Tokens & tokens) -> void override
13001300
{
1301-
auto consumable = get_consumable(args);
1301+
auto consumable = get_consumable(tokens);
13021302

13031303
for (auto it = consumable.begin(); it != consumable.end();)
13041304
{
@@ -1384,13 +1384,13 @@ namespace argparse
13841384
}
13851385
};
13861386

1387-
using argument_uptr = std::unique_ptr<ArgumentCommon>;
1388-
using argument_uptrs = std::vector<argument_uptr>;
1387+
using ArgumentUptr = std::unique_ptr<ArgumentCommon>;
1388+
using ArgumentUptrs = std::vector<ArgumentUptr>;
13891389

13901390
class Formatter
13911391
{
13921392
public:
1393-
auto format_usage(std::ranges::view auto arguments, optstring const & usage, optstring const & prog) const -> std::string
1393+
auto format_usage(std::ranges::view auto arguments, OptString const & usage, OptString const & prog) const -> std::string
13941394
{
13951395
if (usage)
13961396
{
@@ -1400,7 +1400,7 @@ namespace argparse
14001400
return std::format("usage: {}{}{}", *prog, format_usage_optionals(arguments), format_usage_positionals(arguments));
14011401
}
14021402

1403-
auto format_help(std::ranges::view auto arguments, optstring const & prog, optstring const & usage, optstring const & description, optstring const & epilog) const -> std::string
1403+
auto format_help(std::ranges::view auto arguments, OptString const & prog, OptString const & usage, OptString const & description, OptString const & epilog) const -> std::string
14041404
{
14051405
auto message = format_usage(arguments, usage, prog);
14061406
auto positionals = format_help_positionals(arguments, prog);
@@ -1429,7 +1429,7 @@ namespace argparse
14291429
return message;
14301430
}
14311431

1432-
auto format_version(optstring const & version, optstring const & prog) const -> std::string
1432+
auto format_version(OptString const & version, OptString const & prog) const -> std::string
14331433
{
14341434
return replace_prog(*version, prog);
14351435
}
@@ -1512,7 +1512,7 @@ namespace argparse
15121512
return optionals;
15131513
}
15141514

1515-
auto format_help_positionals(std::ranges::view auto arguments, optstring const & prog) const -> std::string
1515+
auto format_help_positionals(std::ranges::view auto arguments, OptString const & prog) const -> std::string
15161516
{
15171517
auto positionals = std::string();
15181518

@@ -1533,7 +1533,7 @@ namespace argparse
15331533
return positionals;
15341534
}
15351535

1536-
auto format_help_optionals(std::ranges::view auto arguments, optstring const & prog) const -> std::string
1536+
auto format_help_optionals(std::ranges::view auto arguments, OptString const & prog) const -> std::string
15371537
{
15381538
auto optionals = std::string();
15391539

@@ -1630,7 +1630,7 @@ namespace argparse
16301630
class MutuallyExclusiveGroup
16311631
{
16321632
public:
1633-
MutuallyExclusiveGroup(argument_uptrs & arguments, optstring & version)
1633+
MutuallyExclusiveGroup(ArgumentUptrs & arguments, OptString & version)
16341634
: m_arguments(arguments)
16351635
, m_version(version)
16361636
{
@@ -1643,14 +1643,14 @@ namespace argparse
16431643
}
16441644

16451645
private:
1646-
argument_uptrs & m_arguments;
1647-
optstring & m_version;
1646+
ArgumentUptrs & m_arguments;
1647+
OptString & m_version;
16481648
};
16491649

16501650
class ArgumentBuilder
16511651
{
16521652
public:
1653-
ArgumentBuilder(argument_uptrs & arguments, optstring & version, std::vector<std::string> names, MutuallyExclusiveGroup const * group = nullptr)
1653+
ArgumentBuilder(ArgumentUptrs & arguments, OptString & version, std::vector<std::string> names, MutuallyExclusiveGroup const * group = nullptr)
16541654
: m_arguments(arguments)
16551655
, m_version(version)
16561656
{
@@ -1768,17 +1768,17 @@ namespace argparse
17681768
}
17691769

17701770
private:
1771-
argument_uptrs & m_arguments;
1772-
optstring & m_version;
1771+
ArgumentUptrs & m_arguments;
1772+
OptString & m_version;
17731773
Options m_options;
17741774
};
17751775

1776-
argument_uptrs m_arguments;
1777-
optstring m_prog;
1778-
optstring m_usage;
1779-
optstring m_description;
1780-
optstring m_epilog;
1781-
optstring m_version;
1776+
ArgumentUptrs m_arguments;
1777+
OptString m_prog;
1778+
OptString m_usage;
1779+
OptString m_description;
1780+
OptString m_epilog;
1781+
OptString m_version;
17821782
Handle m_handle = Handle::errors_help_version;
17831783
};
17841784
}

0 commit comments

Comments
 (0)