Adding back short-cuts

Henry Fredrick Schreiner · Henry Schreiner
1 parent 954c93d5
Showing 2 changed files with 61 additions and 2 deletions
include/CLI/Option.hpp
tests/AppTest.cpp
@@ -83,6 +83,29 @@ template &lt;typename CRTP&gt; class OptionBase {
     /// The status of the 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> {
@@ -92,7 +115,7 @@ class OptionDefaults : public OptionBase&lt;OptionDefaults&gt; {
     // Methods here need a different implementation if they are Option vs. OptionDefault
     /// 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;
         return this;
     }
@@ -307,7 +330,7 @@ class Option : public OptionBase&lt;Option&gt; {
     }
     /// 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)
             throw IncorrectConstruction("multi_option_policy only works for flags and single value options!");
         multi_option_policy_ = value;
@@ -230,6 +230,18 @@ TEST_F(TApp, TakeLastOpt) {
     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) {
     std::string str;
@@ -242,6 +254,18 @@ TEST_F(TApp, TakeFirstOpt) {
     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) {
     std::string str;
@@ -254,6 +278,18 @@ TEST_F(TApp, JoinOpt) {
     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) {
     int count;
     app.add_option("-c,--count", count);