Using nicer format for transform

CLIUtils · Nov 24, 2017 · 8215ec7 · 8215ec7
1 parent c8380d6
commit 8215ec7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
@@ -226,8 +226,11 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a validator-like function that can change result
-    Option *transform(std::function<bool(std::string &)> validator) {
-        validators_.push_back(validator);
+    Option *transform(std::function<std::string(std::string)> func) {
+        validators_.push_back([func](std::string &inout) {
+            inout = func(inout);
+            return true;
+        });
         return this;
     }
 

diff --git a/tests/AppTest.cpp b/tests/AppTest.cpp
@@ -1176,14 +1176,8 @@ TEST_F(TApp, SetWithDefaultsIC) {
 TEST_F(TApp, OrderedModifingValidators) {
     std::vector<std::string> val;
     auto m = app.add_option("-m", val);
-    m->transform([](std::string &x) {
-        x += "1";
-        return true;
-    });
-    m->transform([](std::string &x) {
-        x += "2";
-        return true;
-    });
+    m->transform([](std::string x) { return x + "1"; });
+    m->transform([](std::string x) { return x + "2"; });
 
     args = {"-mone", "-mtwo"};