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

Parse 0 and 1 into booleans (#177)

Browse Source 
* Parse 1 as "true" and 0 as "false" for boolean options.
This commit is contained in:
Jean-Baptiste Bayle 2019-05-28 09:25:54 +02:00 committed by jarro2783
parent d58271c5fd
commit bd20573829
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/cxxopts.hpp
View File

@ -466,9 +466,9 @@ namespace cxxopts
std::basic_regex<char> integer_pattern std::basic_regex<char> integer_pattern
("(-)?(0x)?([0-9a-zA-Z]+)|((0x)?0)"); ("(-)?(0x)?([0-9a-zA-Z]+)|((0x)?0)");
std::basic_regex<char> truthy_pattern std::basic_regex<char> truthy_pattern
("(t|T)(rue)?"); ("(t|T)(rue)?|1");
std::basic_regex<char> falsy_pattern std::basic_regex<char> falsy_pattern
("((f|F)(alse)?)?"); ("(f|F)(alse)?|0");
} }
namespace detail namespace detail

8
test/options.cpp
View File

@ -468,6 +468,8 @@ TEST_CASE("Booleans", "[boolean]") {
("bool", "A Boolean", cxxopts::value<bool>()) ("bool", "A Boolean", cxxopts::value<bool>())
("debug", "Debugging", cxxopts::value<bool>()) ("debug", "Debugging", cxxopts::value<bool>())
("timing", "Timing", cxxopts::value<bool>()) ("timing", "Timing", cxxopts::value<bool>())
("verbose", "Verbose", cxxopts::value<bool>())
("dry-run", "Dry Run", cxxopts::value<bool>())
("noExplicitDefault", "No Explicit Default", cxxopts::value<bool>()) ("noExplicitDefault", "No Explicit Default", cxxopts::value<bool>())
("defaultTrue", "Timing", cxxopts::value<bool>()->default_value("true")) ("defaultTrue", "Timing", cxxopts::value<bool>()->default_value("true"))
("defaultFalse", "Timing", cxxopts::value<bool>()->default_value("false")) ("defaultFalse", "Timing", cxxopts::value<bool>()->default_value("false"))
@ -476,7 +478,7 @@ TEST_CASE("Booleans", "[boolean]") {
options.parse_positional("others"); options.parse_positional("others");
Argv av({"booleans", "--bool=false", "--debug=true", "--timing", "extra"}); Argv av({"booleans", "--bool=false", "--debug=true", "--timing", "--verbose=1", "--dry-run=0", "extra"});
char** argv = av.argv(); char** argv = av.argv();
auto argc = av.argc(); auto argc = av.argc();
@ -486,6 +488,8 @@ TEST_CASE("Booleans", "[boolean]") {
REQUIRE(result.count("bool") == 1); REQUIRE(result.count("bool") == 1);
REQUIRE(result.count("debug") == 1); REQUIRE(result.count("debug") == 1);
REQUIRE(result.count("timing") == 1); REQUIRE(result.count("timing") == 1);
REQUIRE(result.count("verbose") == 1);
REQUIRE(result.count("dry-run") == 1);
REQUIRE(result.count("noExplicitDefault") == 0); REQUIRE(result.count("noExplicitDefault") == 0);
REQUIRE(result.count("defaultTrue") == 0); REQUIRE(result.count("defaultTrue") == 0);
REQUIRE(result.count("defaultFalse") == 0); REQUIRE(result.count("defaultFalse") == 0);
@ -493,6 +497,8 @@ TEST_CASE("Booleans", "[boolean]") {
CHECK(result["bool"].as<bool>() == false); CHECK(result["bool"].as<bool>() == false);
CHECK(result["debug"].as<bool>() == true); CHECK(result["debug"].as<bool>() == true);
CHECK(result["timing"].as<bool>() == true); CHECK(result["timing"].as<bool>() == true);
CHECK(result["verbose"].as<bool>() == true);
CHECK(result["dry-run"].as<bool>() == false);
CHECK(result["noExplicitDefault"].as<bool>() == false); CHECK(result["noExplicitDefault"].as<bool>() == false);
CHECK(result["defaultTrue"].as<bool>() == true); CHECK(result["defaultTrue"].as<bool>() == true);
CHECK(result["defaultFalse"].as<bool>() == false); CHECK(result["defaultFalse"].as<bool>() == false);