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

Adding back short-cuts

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2017-11-28 13:34:56 -05:00 committed by Henry Schreiner
parent 954c93d585
commit d6b983a2a7
2 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/CLI/Option.hpp
View File

@ -83,6 +83,29 @@ template <typename CRTP> class OptionBase {
/// The status of the multi option policy /// The status of the multi option policy
MultiOptionPolicy get_multi_option_policy() const { return multi_option_policy_; } MultiOptionPolicy get_multi_option_policy() const { return multi_option_policy_; }
// Shortcuts for multi option policy
/// Set the multi option policy to take last
CRTP *take_last() {
CRTP *self = static_cast<CRTP *>(this);
self->multi_option_policy(MultiOptionPolicy::TakeLast);
return self;
}
/// Set the multi option policy to take last
CRTP *take_first() {
CRTP *self = static_cast<CRTP *>(this);
self->multi_option_policy(MultiOptionPolicy::TakeFirst);
return self;
}
/// Set the multi option policy to take last
CRTP *join() {
CRTP *self = static_cast<CRTP *>(this);
self->multi_option_policy(MultiOptionPolicy::Join);
return self;
}
}; };
class OptionDefaults : public OptionBase<OptionDefaults> { class OptionDefaults : public OptionBase<OptionDefaults> {
@ -92,7 +115,7 @@ class OptionDefaults : public OptionBase<OptionDefaults> {
// Methods here need a different implementation if they are Option vs. OptionDefault // Methods here need a different implementation if they are Option vs. OptionDefault
/// Take the last argument if given multiple times /// Take the last argument if given multiple times
OptionDefaults *multi_option_policy(MultiOptionPolicy value) { OptionDefaults *multi_option_policy(MultiOptionPolicy value = MultiOptionPolicy::Throw) {
multi_option_policy_ = value; multi_option_policy_ = value;
return this; return this;
} }
@ -307,7 +330,7 @@ class Option : public OptionBase<Option> {
} }
/// Take the last argument if given multiple times /// Take the last argument if given multiple times
Option *multi_option_policy(MultiOptionPolicy value) { Option *multi_option_policy(MultiOptionPolicy value = MultiOptionPolicy::Throw) {
if(get_expected() != 0 && get_expected() != 1) if(get_expected() != 0 && get_expected() != 1)
throw IncorrectConstruction("multi_option_policy only works for flags and single value options!"); throw IncorrectConstruction("multi_option_policy only works for flags and single value options!");
multi_option_policy_ = value; multi_option_policy_ = value;

36
tests/AppTest.cpp
View File

@ -230,6 +230,18 @@ TEST_F(TApp, TakeLastOpt) {
EXPECT_EQ(str, "two"); EXPECT_EQ(str, "two");
} }
TEST_F(TApp, TakeLastOpt2) {
std::string str;
app.add_option("--str", str)->take_last();
args = {"--str=one", "--str=two"};
run();
EXPECT_EQ(str, "two");
}
TEST_F(TApp, TakeFirstOpt) { TEST_F(TApp, TakeFirstOpt) {
std::string str; std::string str;
@ -242,6 +254,18 @@ TEST_F(TApp, TakeFirstOpt) {
EXPECT_EQ(str, "one"); EXPECT_EQ(str, "one");
} }
TEST_F(TApp, TakeFirstOpt2) {
std::string str;
app.add_option("--str", str)->take_first();
args = {"--str=one", "--str=two"};
run();
EXPECT_EQ(str, "one");
}
TEST_F(TApp, JoinOpt) { TEST_F(TApp, JoinOpt) {
std::string str; std::string str;
@ -254,6 +278,18 @@ TEST_F(TApp, JoinOpt) {
EXPECT_EQ(str, "one\ntwo"); EXPECT_EQ(str, "one\ntwo");
} }
TEST_F(TApp, JoinOpt2) {
std::string str;
app.add_option("--str", str)->join();
args = {"--str=one", "--str=two"};
run();
EXPECT_EQ(str, "one\ntwo");
}
TEST_F(TApp, MissingValueNonRequiredOpt) { TEST_F(TApp, MissingValueNonRequiredOpt) {
int count; int count;
app.add_option("-c,--count", count); app.add_option("-c,--count", count);