From 664d12e5e01e9c5a74ab9465a1260167af335a92 Mon Sep 17 00:00:00 2001
From: Christoph Bachhuber <cbachhuber89@gmail.com>
Date: Tue, 3 Dec 2019 20:31:38 +0100
Subject: [PATCH 1/5] Clang-tidy fixes

---
 include/CLI/Option.hpp     | 34 +++++++++++++++++-----------------
 include/CLI/Validators.hpp |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 52d5c167c..abf68523b 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -87,7 +87,7 @@ template <typename CRTP> class OptionBase {
     // setters
 
     /// Changes the group membership
-    CRTP *group(std::string name) {
+    CRTP *group(const std::string& name) {
         group_ = name;
         return static_cast<CRTP *>(this);
     }
@@ -346,7 +346,7 @@ class Option : public OptionBase<Option> {
     bool empty() const { return results_.empty(); }
 
     /// This class is true if option is passed.
-    operator bool() const { return !empty(); }
+    explicit operator bool() const { return !empty(); }
 
     /// Clear the parsed results (mostly for testing)
     void clear() {
@@ -409,7 +409,7 @@ class Option : public OptionBase<Option> {
     bool get_allow_extra_args() const { return allow_extra_args_; }
 
     /// Adds a Validator with a built in type name
-    Option *check(Validator validator, std::string validator_name = "") {
+    Option *check(Validator validator, const std::string& validator_name = "") {
         validator.non_modifying();
         validators_.push_back(std::move(validator));
         if(!validator_name.empty())
@@ -418,7 +418,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a Validator. Takes a const string& and returns an error message (empty if conversion/check is okay).
-    Option *check(std::function<std::string(const std::string &)> Validator,
+    Option *check(const std::function<std::string(const std::string &)>& Validator,
                   std::string Validator_description = "",
                   std::string Validator_name = "") {
         validators_.emplace_back(Validator, std::move(Validator_description), std::move(Validator_name));
@@ -427,7 +427,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a transforming Validator with a built in type name
-    Option *transform(Validator Validator, std::string Validator_name = "") {
+    Option *transform(Validator Validator, const std::string& Validator_name = "") {
         validators_.insert(validators_.begin(), std::move(Validator));
         if(!Validator_name.empty())
             validators_.front().name(Validator_name);
@@ -435,7 +435,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a Validator-like function that can change result
-    Option *transform(std::function<std::string(std::string)> func,
+    Option *transform(const std::function<std::string(std::string)>& func,
                       std::string transform_description = "",
                       std::string transform_name = "") {
         validators_.insert(validators_.begin(),
@@ -451,7 +451,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a user supplied function to run on each item passed in (communicate though lambda capture)
-    Option *each(std::function<void(std::string)> func) {
+    Option *each(const std::function<void(std::string)>& func) {
         validators_.emplace_back(
             [func](std::string &inout) {
                 func(inout);
@@ -559,7 +559,7 @@ class Option : public OptionBase<Option> {
 
     /// Sets environment variable to read if no option given
     Option *envname(std::string name) {
-        envname_ = name;
+        envname_ = std::move(name);
         return this;
     }
 
@@ -663,13 +663,13 @@ class Option : public OptionBase<Option> {
     callback_t get_callback() const { return callback_; }
 
     /// Get the long names
-    const std::vector<std::string> get_lnames() const { return lnames_; }
+    std::vector<std::string> get_lnames() const { return lnames_; }
 
     /// Get the short names
-    const std::vector<std::string> get_snames() const { return snames_; }
+    std::vector<std::string> get_snames() const { return snames_; }
 
     /// Get the flag names with specified default values
-    const std::vector<std::string> get_fnames() const { return fnames_; }
+    std::vector<std::string> get_fnames() const { return fnames_; }
 
     /// The number of times the option expects to be included
     int get_expected() const { return expected_min_; }
@@ -845,11 +845,11 @@ class Option : public OptionBase<Option> {
     }
 
     /// Requires "-" to be removed from string
-    bool check_sname(std::string name) const { return (detail::find_member(name, snames_, ignore_case_) >= 0); }
+    bool check_sname(std::string name) const { return (detail::find_member(std::move(name), snames_, ignore_case_) >= 0); }
 
     /// Requires "--" to be removed from string
     bool check_lname(std::string name) const {
-        return (detail::find_member(name, lnames_, ignore_case_, ignore_underscore_) >= 0);
+        return (detail::find_member(std::move(name), lnames_, ignore_case_, ignore_underscore_) >= 0);
     }
 
     /// Requires "--" to be removed from string
@@ -857,12 +857,12 @@ class Option : public OptionBase<Option> {
         if(fnames_.empty()) {
             return false;
         }
-        return (detail::find_member(name, fnames_, ignore_case_, ignore_underscore_) >= 0);
+        return (detail::find_member(std::move(name), fnames_, ignore_case_, ignore_underscore_) >= 0);
     }
 
     /// Get the value that goes for a flag, nominally gets the default value but allows for overrides if not
     /// disabled
-    std::string get_flag_value(std::string name, std::string input_value) const {
+    std::string get_flag_value(const std::string& name, std::string input_value) const {
         static const std::string trueString{"true"};
         static const std::string falseString{"false"};
         static const std::string emptyString{"{}"};
@@ -1061,12 +1061,12 @@ class Option : public OptionBase<Option> {
 
     /// Set the default value string representation (does not change the contained value)
     Option *default_str(std::string val) {
-        default_str_ = val;
+        default_str_ = std::move(val);
         return this;
     }
 
     /// Set the default value string representation and evaluate into the bound value
-    Option *default_val(std::string val) {
+    Option *default_val(const std::string& val) {
         default_str(val);
         auto old_results = results_;
         results_.clear();
diff --git a/include/CLI/Validators.hpp b/include/CLI/Validators.hpp
index 515180572..ea0b2a296 100644
--- a/include/CLI/Validators.hpp
+++ b/include/CLI/Validators.hpp
@@ -54,7 +54,7 @@ class Validator {
     /// This is the description function, if empty the description_ will be used
     std::function<std::string()> desc_function_{[]() { return std::string{}; }};
 
-    /// This it the base function that is to be called.
+    /// This is the base function that is to be called.
     /// Returns a string error message if validation fails.
     std::function<std::string(std::string &)> func_{[](std::string &) { return std::string{}; }};
     /// The name for search purposes of the Validator

From fdce058b0c92cbfd23096c458ead4e011d1f3f87 Mon Sep 17 00:00:00 2001
From: Christoph Bachhuber <cbachhuber89@gmail.com>
Date: Tue, 3 Dec 2019 20:36:05 +0100
Subject: [PATCH 2/5] Format

---
 include/CLI/Option.hpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index abf68523b..f1d98aee0 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -87,7 +87,7 @@ template <typename CRTP> class OptionBase {
     // setters
 
     /// Changes the group membership
-    CRTP *group(const std::string& name) {
+    CRTP *group(const std::string &name) {
         group_ = name;
         return static_cast<CRTP *>(this);
     }
@@ -409,7 +409,7 @@ class Option : public OptionBase<Option> {
     bool get_allow_extra_args() const { return allow_extra_args_; }
 
     /// Adds a Validator with a built in type name
-    Option *check(Validator validator, const std::string& validator_name = "") {
+    Option *check(Validator validator, const std::string &validator_name = "") {
         validator.non_modifying();
         validators_.push_back(std::move(validator));
         if(!validator_name.empty())
@@ -418,7 +418,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a Validator. Takes a const string& and returns an error message (empty if conversion/check is okay).
-    Option *check(const std::function<std::string(const std::string &)>& Validator,
+    Option *check(const std::function<std::string(const std::string &)> &Validator,
                   std::string Validator_description = "",
                   std::string Validator_name = "") {
         validators_.emplace_back(Validator, std::move(Validator_description), std::move(Validator_name));
@@ -427,7 +427,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a transforming Validator with a built in type name
-    Option *transform(Validator Validator, const std::string& Validator_name = "") {
+    Option *transform(Validator Validator, const std::string &Validator_name = "") {
         validators_.insert(validators_.begin(), std::move(Validator));
         if(!Validator_name.empty())
             validators_.front().name(Validator_name);
@@ -435,7 +435,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a Validator-like function that can change result
-    Option *transform(const std::function<std::string(std::string)>& func,
+    Option *transform(const std::function<std::string(std::string)> &func,
                       std::string transform_description = "",
                       std::string transform_name = "") {
         validators_.insert(validators_.begin(),
@@ -451,7 +451,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a user supplied function to run on each item passed in (communicate though lambda capture)
-    Option *each(const std::function<void(std::string)>& func) {
+    Option *each(const std::function<void(std::string)> &func) {
         validators_.emplace_back(
             [func](std::string &inout) {
                 func(inout);
@@ -718,7 +718,7 @@ class Option : public OptionBase<Option> {
     /// Use `get_name(true)` to get the positional name (replaces `get_pname`)
     std::string get_name(bool positional = false, //<[input] Show the positional name
                          bool all_options = false //<[input] Show every option
-                         ) const {
+    ) const {
         if(get_group().empty())
             return {}; // Hidden
 
@@ -845,7 +845,9 @@ class Option : public OptionBase<Option> {
     }
 
     /// Requires "-" to be removed from string
-    bool check_sname(std::string name) const { return (detail::find_member(std::move(name), snames_, ignore_case_) >= 0); }
+    bool check_sname(std::string name) const {
+        return (detail::find_member(std::move(name), snames_, ignore_case_) >= 0);
+    }
 
     /// Requires "--" to be removed from string
     bool check_lname(std::string name) const {
@@ -862,7 +864,7 @@ class Option : public OptionBase<Option> {
 
     /// Get the value that goes for a flag, nominally gets the default value but allows for overrides if not
     /// disabled
-    std::string get_flag_value(const std::string& name, std::string input_value) const {
+    std::string get_flag_value(const std::string &name, std::string input_value) const {
         static const std::string trueString{"true"};
         static const std::string falseString{"false"};
         static const std::string emptyString{"{}"};
@@ -1066,7 +1068,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Set the default value string representation and evaluate into the bound value
-    Option *default_val(const std::string& val) {
+    Option *default_val(const std::string &val) {
         default_str(val);
         auto old_results = results_;
         results_.clear();

From de76983e733ccc32b399a2343be3687d3615fc05 Mon Sep 17 00:00:00 2001
From: Christoph Bachhuber <cbachhuber89@gmail.com>
Date: Tue, 3 Dec 2019 20:43:22 +0100
Subject: [PATCH 3/5] Satisfy pre-commit hooks

---
 include/CLI/Option.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index f1d98aee0..483d8088b 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -718,7 +718,7 @@ class Option : public OptionBase<Option> {
     /// Use `get_name(true)` to get the positional name (replaces `get_pname`)
     std::string get_name(bool positional = false, //<[input] Show the positional name
                          bool all_options = false //<[input] Show every option
-    ) const {
+                         ) const {
         if(get_group().empty())
             return {}; // Hidden
 

From cd7dae2f5ee4f849fe91c7733f74afe5fe856447 Mon Sep 17 00:00:00 2001
From: Christoph Bachhuber <cbachhuber89@gmail.com>
Date: Tue, 3 Dec 2019 21:05:21 +0100
Subject: [PATCH 4/5] Fix getters to constref return

---
 include/CLI/Option.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 483d8088b..562ec783d 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -418,7 +418,7 @@ class Option : public OptionBase<Option> {
     }
 
     /// Adds a Validator. Takes a const string& and returns an error message (empty if conversion/check is okay).
-    Option *check(const std::function<std::string(const std::string &)> &Validator,
+    Option *check(std::function<std::string(const std::string &)> Validator,
                   std::string Validator_description = "",
                   std::string Validator_name = "") {
         validators_.emplace_back(Validator, std::move(Validator_description), std::move(Validator_name));
@@ -663,10 +663,10 @@ class Option : public OptionBase<Option> {
     callback_t get_callback() const { return callback_; }
 
     /// Get the long names
-    std::vector<std::string> get_lnames() const { return lnames_; }
+    const std::vector<std::string> &get_lnames() const { return lnames_; }
 
     /// Get the short names
-    std::vector<std::string> get_snames() const { return snames_; }
+    const std::vector<std::string> &get_snames() const { return snames_; }
 
     /// Get the flag names with specified default values
     std::vector<std::string> get_fnames() const { return fnames_; }

From 4426965e0f9abc2a299bfcaeecd4afddb215debf Mon Sep 17 00:00:00 2001
From: Christoph Bachhuber <cbachhuber89@gmail.com>
Date: Wed, 4 Dec 2019 20:56:31 +0100
Subject: [PATCH 5/5] Final name getter as constref

---
 include/CLI/Option.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 562ec783d..51d23ee73 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -669,7 +669,7 @@ class Option : public OptionBase<Option> {
     const std::vector<std::string> &get_snames() const { return snames_; }
 
     /// Get the flag names with specified default values
-    std::vector<std::string> get_fnames() const { return fnames_; }
+    const std::vector<std::string> &get_fnames() const { return fnames_; }
 
     /// The number of times the option expects to be included
     int get_expected() const { return expected_min_; }