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

Clang-tidy fixes (#360)

Browse Source 
* Clang-tidy fixes

* Format

* Satisfy pre-commit hooks

* Fix getters to constref return

* Final name getter as constref
This commit is contained in:
Christoph Bachhuber 2019-12-05 03:17:06 +01:00 committed by Henry Schreiner
parent fc0f82a81f
commit d9379cccf5
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/CLI/Option.hpp
View File

@ -87,7 +87,7 @@ template <typename CRTP> class OptionBase {
// setters // setters
/// Changes the group membership /// Changes the group membership
CRTP *group(std::string name) { CRTP *group(const std::string &name) {
group_ = name; group_ = name;
return static_cast<CRTP *>(this); return static_cast<CRTP *>(this);
} }
@ -346,7 +346,7 @@ class Option : public OptionBase<Option> {
bool empty() const { return results_.empty(); } bool empty() const { return results_.empty(); }
/// This class is true if option is passed. /// 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) /// Clear the parsed results (mostly for testing)
void clear() { void clear() {
@ -409,7 +409,7 @@ class Option : public OptionBase<Option> {
bool get_allow_extra_args() const { return allow_extra_args_; } bool get_allow_extra_args() const { return allow_extra_args_; }
/// Adds a Validator with a built in type name /// 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(); validator.non_modifying();
validators_.push_back(std::move(validator)); validators_.push_back(std::move(validator));
if(!validator_name.empty()) if(!validator_name.empty())
@ -427,7 +427,7 @@ class Option : public OptionBase<Option> {
} }
/// Adds a transforming Validator with a built in type name /// 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)); validators_.insert(validators_.begin(), std::move(Validator));
if(!Validator_name.empty()) if(!Validator_name.empty())
validators_.front().name(Validator_name); validators_.front().name(Validator_name);
@ -435,7 +435,7 @@ class Option : public OptionBase<Option> {
} }
/// Adds a Validator-like function that can change result /// 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_description = "",
std::string transform_name = "") { std::string transform_name = "") {
validators_.insert(validators_.begin(), 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) /// 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( validators_.emplace_back(
[func](std::string &inout) { [func](std::string &inout) {
func(inout); func(inout);
@ -559,7 +559,7 @@ class Option : public OptionBase<Option> {
/// Sets environment variable to read if no option given /// Sets environment variable to read if no option given
Option *envname(std::string name) { Option *envname(std::string name) {
envname_ = name; envname_ = std::move(name);
return this; return this;
} }
@ -663,13 +663,13 @@ class Option : public OptionBase<Option> {
callback_t get_callback() const { return callback_; } callback_t get_callback() const { return callback_; }
/// Get the long names /// Get the long names
const std::vector<std::string> get_lnames() const { return lnames_; } const std::vector<std::string> &get_lnames() const { return lnames_; }
/// Get the short names /// Get the short names
const 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 /// Get the flag names with specified default values
const 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 /// The number of times the option expects to be included
int get_expected() const { return expected_min_; } int get_expected() const { return expected_min_; }
@ -845,11 +845,13 @@ class Option : public OptionBase<Option> {
} }
/// Requires "-" to be removed from string /// 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 /// Requires "--" to be removed from string
bool check_lname(std::string name) const { 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 /// Requires "--" to be removed from string
@ -857,12 +859,12 @@ class Option : public OptionBase<Option> {
if(fnames_.empty()) { if(fnames_.empty()) {
return false; 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 /// Get the value that goes for a flag, nominally gets the default value but allows for overrides if not
/// disabled /// 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 trueString{"true"};
static const std::string falseString{"false"}; static const std::string falseString{"false"};
static const std::string emptyString{"{}"}; static const std::string emptyString{"{}"};
@ -1061,12 +1063,12 @@ class Option : public OptionBase<Option> {
/// Set the default value string representation (does not change the contained value) /// Set the default value string representation (does not change the contained value)
Option *default_str(std::string val) { Option *default_str(std::string val) {
default_str_ = val; default_str_ = std::move(val);
return this; return this;
} }
/// Set the default value string representation and evaluate into the bound value /// 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); default_str(val);
auto old_results = results_; auto old_results = results_;
results_.clear(); results_.clear();

2
include/CLI/Validators.hpp
View File

@ -54,7 +54,7 @@ class Validator {
/// This is the description function, if empty the description_ will be used /// This is the description function, if empty the description_ will be used
std::function<std::string()> desc_function_{[]() { return std::string{}; }}; 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. /// Returns a string error message if validation fails.
std::function<std::string(std::string &)> func_{[](std::string &) { return std::string{}; }}; std::function<std::string(std::string &)> func_{[](std::string &) { return std::string{}; }};
/// The name for search purposes of the Validator /// The name for search purposes of the Validator