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

Add and fix cpplint readability/braces (#431)

Browse Source 
* Add readability/braces check

* Fix cpplint readability/braces issues
This commit is contained in:
Christoph Bachhuber 2020-02-13 09:47:36 +01:00 committed by GitHub
parent 51a0efcbbc
commit 5ecb61599a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CPPLINT.cfg
View File

@ -9,5 +9,5 @@ filter=-whitespace/blank_line # Unnecessarily strict with blank lines that othe
filter=-whitespace/parens,-whitespace/braces # Conflict with clang-format filter=-whitespace/parens,-whitespace/braces # Conflict with clang-format
# Filters to be included in future # Filters to be included in future
filter=-whitespace/indent,-whitespace/comments,-readability/braces filter=-whitespace/indent,-whitespace/comments

3
include/CLI/App.hpp
View File

@ -1246,8 +1246,9 @@ class App {
name_ = nstr.first; name_ = nstr.first;
} }
commandline = std::move(nstr.second); commandline = std::move(nstr.second);
} else } else {
detail::trim(commandline); detail::trim(commandline);
}
// the next section of code is to deal with quoted arguments after an '=' or ':' for windows like operations // the next section of code is to deal with quoted arguments after an '=' or ':' for windows like operations
if(!commandline.empty()) { if(!commandline.empty()) {
commandline = detail::find_and_modify(commandline, "=", detail::escape_detect); commandline = detail::find_and_modify(commandline, "=", detail::escape_detect);

7
include/CLI/StringTools.hpp
View File

@ -42,9 +42,9 @@ constexpr int expected_max_vector_size{1 << 29};
inline std::vector<std::string> split(const std::string &s, char delim) { inline std::vector<std::string> split(const std::string &s, char delim) {
std::vector<std::string> elems; std::vector<std::string> elems;
// Check to see if empty string, give consistent result // Check to see if empty string, give consistent result
if(s.empty()) if(s.empty()) {
elems.emplace_back(); elems.emplace_back();
else { } else {
std::stringstream ss; std::stringstream ss;
ss.str(s); ss.str(s);
std::string item; std::string item;
@ -264,8 +264,9 @@ inline std::ptrdiff_t find_member(std::string name,
it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) { it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
return detail::remove_underscore(local_name) == name; return detail::remove_underscore(local_name) == name;
}); });
} else } else {
it = std::find(std::begin(names), std::end(names), name); it = std::find(std::begin(names), std::end(names), name);
}
return (it != std::end(names)) ? (it - std::begin(names)) : (-1); return (it != std::end(names)) ? (it - std::begin(names)) : (-1);
} }

8
include/CLI/Validators.hpp
View File

@ -107,14 +107,14 @@ class Validator {
} }
} }
return retstring; return retstring;
}; }
/// This is the required operator for a Validator - provided to help /// This is the required operator for a Validator - provided to help
/// users (CLI11 uses the member `func` directly) /// users (CLI11 uses the member `func` directly)
std::string operator()(const std::string &str) const { std::string operator()(const std::string &str) const {
std::string value = str; std::string value = str;
return (active_) ? func_(value) : std::string{}; return (active_) ? func_(value) : std::string{};
}; }
/// Specify the type string /// Specify the type string
Validator &description(std::string validator_desc) { Validator &description(std::string validator_desc) {
@ -168,13 +168,13 @@ class Validator {
Validator &application_index(int app_index) { Validator &application_index(int app_index) {
application_index_ = app_index; application_index_ = app_index;
return *this; return *this;
}; }
/// Specify the application index of a validator /// Specify the application index of a validator
Validator application_index(int app_index) const { Validator application_index(int app_index) const {
Validator newval(*this); Validator newval(*this);
newval.application_index_ = app_index; newval.application_index_ = app_index;
return newval; return newval;
}; }
/// Get the current value of the application index /// Get the current value of the application index
int get_application_index() const { return application_index_; } int get_application_index() const { return application_index_; }
/// Get a boolean if the validator is active /// Get a boolean if the validator is active