From bec93acaa774ba8d66502332e4c88a6c6838eb45 Mon Sep 17 00:00:00 2001 From: Yoshihiro Hokazono Date: Thu, 16 Sep 2021 07:00:49 +0900 Subject: [PATCH] Avoid use ALL_CAPS for enumerators --- include/argparse/argparse.hpp | 14 +++++++------- test/test_actions.cpp | 2 +- test/test_optional_arguments.cpp | 8 ++++---- test/test_positional_arguments.cpp | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/argparse/argparse.hpp b/include/argparse/argparse.hpp index 4789d7f..e0a5c84 100644 --- a/include/argparse/argparse.hpp +++ b/include/argparse/argparse.hpp @@ -347,9 +347,9 @@ public: }; enum class NArgsPattern { - ZERO_OR_ONE, - ANY, - AT_LEAST_ONE + ZeroOrOne, + Any, + AtLeastOne }; class ArgumentParser; @@ -477,13 +477,13 @@ public: Argument &nargs(NArgsPattern aNargs) { switch (aNargs) { - case NArgsPattern::ZERO_OR_ONE: + case NArgsPattern::ZeroOrOne: mNumArgsRange = SizeRange{0, 1}; break; - case NArgsPattern::ANY: + case NArgsPattern::Any: mNumArgsRange = SizeRange{0, std::numeric_limits::max()}; break; - case NArgsPattern::AT_LEAST_ONE: + case NArgsPattern::AtLeastOne: mNumArgsRange = SizeRange{1, std::numeric_limits::max()}; break; } @@ -492,7 +492,7 @@ public: Argument &remaining() { mAcceptsOptionalLikeValue = true; - return nargs(NArgsPattern::ANY); + return nargs(NArgsPattern::Any); } template diff --git a/test/test_actions.cpp b/test/test_actions.cpp index b315d16..dbc9d5b 100644 --- a/test/test_actions.cpp +++ b/test/test_actions.cpp @@ -126,7 +126,7 @@ TEST_CASE("Users can use actions on nargs=ANY arguments" * argparse::ArgumentParser program("sum"); int result = 0; - program.add_argument("all").nargs(argparse::NArgsPattern::ANY).action( + program.add_argument("all").nargs(argparse::NArgsPattern::Any).action( [](int &sum, std::string const &value) { sum += std::stoi(value); }, std::ref(result)); diff --git a/test/test_optional_arguments.cpp b/test/test_optional_arguments.cpp index dd06d62..262cc6f 100644 --- a/test/test_optional_arguments.cpp +++ b/test/test_optional_arguments.cpp @@ -114,8 +114,8 @@ TEST_CASE("Parse 2 optional arguments of many values" * test_suite("optional_arguments")) { GIVEN("a program that accepts 2 optional arguments of many values") { argparse::ArgumentParser program("test"); - program.add_argument("-i").nargs(argparse::NArgsPattern::ANY).scan<'i', int>(); - program.add_argument("-s").nargs(argparse::NArgsPattern::ANY); + program.add_argument("-i").nargs(argparse::NArgsPattern::Any).scan<'i', int>(); + program.add_argument("-s").nargs(argparse::NArgsPattern::Any); WHEN("provided no argument") { THEN("the program accepts it and gets empty container") { @@ -156,8 +156,8 @@ TEST_CASE("Parse an optional argument of many values" GIVEN("a program that accepts an optional argument of many values" " and a positional argument of many values") { argparse::ArgumentParser program("test"); - program.add_argument("-s").nargs(argparse::NArgsPattern::ANY); - program.add_argument("input").nargs(argparse::NArgsPattern::ANY); + program.add_argument("-s").nargs(argparse::NArgsPattern::Any); + program.add_argument("input").nargs(argparse::NArgsPattern::Any); WHEN("provided no argument") { program.parse_args({"test"}); diff --git a/test/test_positional_arguments.cpp b/test/test_positional_arguments.cpp index 2cc6f94..6a7a6cb 100644 --- a/test/test_positional_arguments.cpp +++ b/test/test_positional_arguments.cpp @@ -142,7 +142,7 @@ TEST_CASE("Parse positional nargs=ANY arguments" * GIVEN("a program that accepts an optional argument and nargs=ANY positional arguments") { argparse::ArgumentParser program("test"); program.add_argument("-o"); - program.add_argument("input").nargs(argparse::NArgsPattern::ANY); + program.add_argument("input").nargs(argparse::NArgsPattern::Any); WHEN("provided no argument") { THEN("the program accepts it and gets empty container") {