KeqingMoe/argparse
1
0
Fork 0
mirror of https://github.com/KeqingMoe/argparse.git synced 2025-07-04 15:14:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Iterate over map instead of both lists

Browse Source
This commit is contained in:
Stephan van Veen 2019-05-18 14:35:37 +02:00
parent 62c2be634a
commit f2e0bd0de1
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
include/argparse.hpp
View File

@ -478,26 +478,20 @@ class ArgumentParser {
* @throws std::runtime_error in case of any invalid argument * @throws std::runtime_error in case of any invalid argument
*/ */
void parse_args_validate() { void parse_args_validate() {
try { // Check if all arguments are parsed
// Check if all positional arguments are parsed std::for_each(std::begin(mArgumentMap), std::end(mArgumentMap), [](const auto& argPair) {
std::for_each(std::begin(mPositionalArguments), const auto& [key, arg] = argPair;
std::end(mPositionalArguments), arg->validate();
std::mem_fn(&Argument::validate)); });
// Check if all user-provided optional argument values are parsed correctly
std::for_each(std::begin(mOptionalArguments),
std::end(mOptionalArguments),
std::mem_fn(&Argument::validate));
} catch (const std::runtime_error& err) {
throw err;
}
} }
// Used by print_help. // Used by print_help.
size_t get_length_of_longest_argument(const std::vector<std::shared_ptr<Argument>>& aArguments) { size_t get_length_of_longest_argument() {
if (aArguments.empty()) if (mArgumentMap.empty())
return 0; return 0;
std::vector<size_t> argumentLengths(aArguments.size()); std::vector<size_t> argumentLengths(mArgumentMap.size());
std::transform(std::begin(aArguments), std::end(aArguments), std::begin(argumentLengths), [](const auto& arg) { std::transform(std::begin(mArgumentMap), std::end(mArgumentMap), std::begin(argumentLengths), [](const auto& argPair) {
const auto& [key, arg] = argPair;
const auto& names = arg->mNames; const auto& names = arg->mNames;
auto maxLength = std::accumulate(std::begin(names), std::end(names), std::string::size_type{0}, [](const auto& sum, const auto& s) { auto maxLength = std::accumulate(std::begin(names), std::end(names), std::string::size_type{0}, [](const auto& sum, const auto& s) {
return sum + s.size() + 2; // +2 for ", " return sum + s.size() + 2; // +2 for ", "
@ -507,14 +501,6 @@ class ArgumentParser {
return *std::max_element(std::begin(argumentLengths), std::end(argumentLengths)); return *std::max_element(std::begin(argumentLengths), std::end(argumentLengths));
} }
// Used by print_help.
size_t get_length_of_longest_argument() {
const auto positionalArgMaxSize = get_length_of_longest_argument(mPositionalArguments);
const auto optionalArgMaxSize = get_length_of_longest_argument(mOptionalArguments);
return std::max(positionalArgMaxSize, optionalArgMaxSize);
}
std::string mProgramName; std::string mProgramName;
std::vector<ArgumentParser> mParentParsers; std::vector<ArgumentParser> mParentParsers;
std::vector<std::shared_ptr<Argument>> mPositionalArguments; std::vector<std::shared_ptr<Argument>> mPositionalArguments;