External/cxxopts
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed integer_pattern so it works correctly under clang. Added testcase for invalid integers and for 0x0 being a valid number.

Browse Source
This commit is contained in:
DevCodeOne 2017-11-01 01:13:00 +01:00
parent 7c3a063b4b
commit 8c648b1152
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/cxxopts.hpp
View File

@ -431,7 +431,7 @@ namespace cxxopts
namespace namespace
{ {
std::basic_regex<char> integer_pattern std::basic_regex<char> integer_pattern
("(-)?(0x)?([1-9a-zA-Z][0-9a-zA-Z]*)|(0)|(0x0)"); ("(-)?(0x)?([1-9a-zA-Z][0-9a-zA-Z]*)|((0x)?0)");
} }
namespace detail namespace detail

18
test/options.cpp
View File

@ -246,7 +246,7 @@ TEST_CASE("Integers", "[options]")
options.add_options() options.add_options()
("positional", "Integers", cxxopts::value<std::vector<int>>()); ("positional", "Integers", cxxopts::value<std::vector<int>>());
Argv av({"ints", "--", "5", "6", "-6", "0", "0xab", "0xAf"}); Argv av({"ints", "--", "5", "6", "-6", "0", "0xab", "0xAf", "0x0"});
char** argv = av.argv(); char** argv = av.argv();
auto argc = av.argc(); auto argc = av.argc();
@ -254,7 +254,7 @@ TEST_CASE("Integers", "[options]")
options.parse_positional("positional"); options.parse_positional("positional");
options.parse(argc, argv); options.parse(argc, argv);
REQUIRE(options.count("positional") == 6); REQUIRE(options.count("positional") == 7);
auto& positional = options["positional"].as<std::vector<int>>(); auto& positional = options["positional"].as<std::vector<int>>();
CHECK(positional[0] == 5); CHECK(positional[0] == 5);
@ -263,6 +263,7 @@ TEST_CASE("Integers", "[options]")
CHECK(positional[3] == 0); CHECK(positional[3] == 0);
CHECK(positional[4] == 0xab); CHECK(positional[4] == 0xab);
CHECK(positional[5] == 0xaf); CHECK(positional[5] == 0xaf);
CHECK(positional[6] == 0x0);
} }
TEST_CASE("Unsigned integers", "[options]") TEST_CASE("Unsigned integers", "[options]")
@ -364,3 +365,16 @@ TEST_CASE("Floats", "[options]")
CHECK(positional[3] == -1.5e6); CHECK(positional[3] == -1.5e6);
} }
TEST_CASE("Invalid integers", "[integer]") {
cxxopts::Options options("invalid_integers", "rejects invalid integers");
options.add_options()
("positional", "Integers", cxxopts::value<std::vector<int>>());
Argv av({"ints", "--", "Ae"});
char **argv = av.argv();
auto argc = av.argc();
options.parse_positional("positional");
CHECK_THROWS_AS(options.parse(argc, argv), cxxopts::argument_incorrect_type);
}