Avoid use ALL_CAPS for enumerators

This commit is contained in:
Yoshihiro Hokazono 2021-09-16 07:00:49 +09:00
parent 8845260885
commit bec93acaa7
4 changed files with 13 additions and 13 deletions

View File

@ -347,9 +347,9 @@ public:
}; };
enum class NArgsPattern { enum class NArgsPattern {
ZERO_OR_ONE, ZeroOrOne,
ANY, Any,
AT_LEAST_ONE AtLeastOne
}; };
class ArgumentParser; class ArgumentParser;
@ -477,13 +477,13 @@ public:
Argument &nargs(NArgsPattern aNargs) { Argument &nargs(NArgsPattern aNargs) {
switch (aNargs) { switch (aNargs) {
case NArgsPattern::ZERO_OR_ONE: case NArgsPattern::ZeroOrOne:
mNumArgsRange = SizeRange{0, 1}; mNumArgsRange = SizeRange{0, 1};
break; break;
case NArgsPattern::ANY: case NArgsPattern::Any:
mNumArgsRange = SizeRange{0, std::numeric_limits<std::size_t>::max()}; mNumArgsRange = SizeRange{0, std::numeric_limits<std::size_t>::max()};
break; break;
case NArgsPattern::AT_LEAST_ONE: case NArgsPattern::AtLeastOne:
mNumArgsRange = SizeRange{1, std::numeric_limits<std::size_t>::max()}; mNumArgsRange = SizeRange{1, std::numeric_limits<std::size_t>::max()};
break; break;
} }
@ -492,7 +492,7 @@ public:
Argument &remaining() { Argument &remaining() {
mAcceptsOptionalLikeValue = true; mAcceptsOptionalLikeValue = true;
return nargs(NArgsPattern::ANY); return nargs(NArgsPattern::Any);
} }
template <typename Iterator> template <typename Iterator>

View File

@ -126,7 +126,7 @@ TEST_CASE("Users can use actions on nargs=ANY arguments" *
argparse::ArgumentParser program("sum"); argparse::ArgumentParser program("sum");
int result = 0; 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); }, [](int &sum, std::string const &value) { sum += std::stoi(value); },
std::ref(result)); std::ref(result));

View File

@ -114,8 +114,8 @@ TEST_CASE("Parse 2 optional arguments of many values" *
test_suite("optional_arguments")) { test_suite("optional_arguments")) {
GIVEN("a program that accepts 2 optional arguments of many values") { GIVEN("a program that accepts 2 optional arguments of many values") {
argparse::ArgumentParser program("test"); argparse::ArgumentParser program("test");
program.add_argument("-i").nargs(argparse::NArgsPattern::ANY).scan<'i', int>(); program.add_argument("-i").nargs(argparse::NArgsPattern::Any).scan<'i', int>();
program.add_argument("-s").nargs(argparse::NArgsPattern::ANY); program.add_argument("-s").nargs(argparse::NArgsPattern::Any);
WHEN("provided no argument") { WHEN("provided no argument") {
THEN("the program accepts it and gets empty container") { 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" GIVEN("a program that accepts an optional argument of many values"
" and a positional argument of many values") { " and a positional argument of many values") {
argparse::ArgumentParser program("test"); argparse::ArgumentParser program("test");
program.add_argument("-s").nargs(argparse::NArgsPattern::ANY); program.add_argument("-s").nargs(argparse::NArgsPattern::Any);
program.add_argument("input").nargs(argparse::NArgsPattern::ANY); program.add_argument("input").nargs(argparse::NArgsPattern::Any);
WHEN("provided no argument") { WHEN("provided no argument") {
program.parse_args({"test"}); program.parse_args({"test"});

View File

@ -142,7 +142,7 @@ TEST_CASE("Parse positional nargs=ANY arguments" *
GIVEN("a program that accepts an optional argument and nargs=ANY positional arguments") { GIVEN("a program that accepts an optional argument and nargs=ANY positional arguments") {
argparse::ArgumentParser program("test"); argparse::ArgumentParser program("test");
program.add_argument("-o"); program.add_argument("-o");
program.add_argument("input").nargs(argparse::NArgsPattern::ANY); program.add_argument("input").nargs(argparse::NArgsPattern::Any);
WHEN("provided no argument") { WHEN("provided no argument") {
THEN("the program accepts it and gets empty container") { THEN("the program accepts it and gets empty container") {