mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-04-30 04:33:53 +00:00
Code Issues Releases Wiki Activity

Fix #64 by auto-adding symmetric excludes

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2018-03-26 10:16:27 +02:00 committed by Henry Schreiner
parent 2b4780d74a
commit 268c26ad62
4 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,6 +1,11 @@
## In progress ## In progress
* Fix unlimited short options eating two values before checking for positionals when no space present #90 * Fix unlimited short options eating two values before checking for positionals when no space present [#90]
* Symmetric exclude text when excluding options, exclude can be called multiple times [#64]
[#64]: https://github.com/CLIUtils/CLI11/issues/64
[#90]: https://github.com/CLIUtils/CLI11/issues/90
## Version 1.4: More feedback ## Version 1.4: More feedback

11
include/CLI/Option.hpp
View File

@ -315,9 +315,14 @@ class Option : public OptionBase<Option> {
/// Sets excluded options /// Sets excluded options
Option *excludes(Option *opt) { Option *excludes(Option *opt) {
auto tup = excludes_.insert(opt); excludes_.insert(opt);
if(!tup.second)
throw OptionAlreadyAdded::Excludes(get_name(), opt->get_name()); // Help text should be symmetric - excluding a should exclude b
opt->excludes_.insert(this);
// Ignoring the insert return value, excluding twice is now allowed.
// (Mostly to allow both directions to be excluded by user, even though the library does it for you.)
return this; return this;
} }

12
tests/CreationTest.cpp
View File

@ -187,18 +187,20 @@ TEST_F(TApp, IncorrectConstructionDuplicateNeedsTxt) {
EXPECT_THROW(cat->needs("--other"), CLI::OptionAlreadyAdded); EXPECT_THROW(cat->needs("--other"), CLI::OptionAlreadyAdded);
} }
TEST_F(TApp, IncorrectConstructionDuplicateExcludes) { // Now allowed
TEST_F(TApp, CorrectConstructionDuplicateExcludes) {
auto cat = app.add_flag("--cat"); auto cat = app.add_flag("--cat");
auto other = app.add_flag("--other"); auto other = app.add_flag("--other");
ASSERT_NO_THROW(cat->excludes(other)); ASSERT_NO_THROW(cat->excludes(other));
EXPECT_THROW(cat->excludes(other), CLI::OptionAlreadyAdded); ASSERT_NO_THROW(other->excludes(cat));
} }
TEST_F(TApp, IncorrectConstructionDuplicateExcludesTxt) { // Now allowed
TEST_F(TApp, CorrectConstructionDuplicateExcludesTxt) {
auto cat = app.add_flag("--cat"); auto cat = app.add_flag("--cat");
app.add_flag("--other"); auto other = app.add_flag("--other");
ASSERT_NO_THROW(cat->excludes("--other")); ASSERT_NO_THROW(cat->excludes("--other"));
EXPECT_THROW(cat->excludes("--other"), CLI::OptionAlreadyAdded); ASSERT_NO_THROW(other->excludes("--cat"));
} }
TEST_F(TApp, CheckName) { TEST_F(TApp, CheckName) {

11
tests/HelpTest.cpp
View File

@ -203,6 +203,17 @@ TEST(THelp, ExcludesPositional) {
EXPECT_THAT(help, HasSubstr("Excludes: op1")); EXPECT_THAT(help, HasSubstr("Excludes: op1"));
} }
TEST(THelp, ExcludesSymmetric) {
CLI::App app{"My prog"};
CLI::Option *op1 = app.add_flag("--op1");
app.add_flag("--op2")->excludes(op1);
std::string help = app.help();
EXPECT_THAT(help, HasSubstr("Excludes: --op2"));
}
TEST(THelp, ManualSetters) { TEST(THelp, ManualSetters) {
CLI::App app{"My prog"}; CLI::App app{"My prog"};