Skip to content

Commit

Permalink
Merge pull request p-ranav#162 from skrobinson/wip-port-aayush749-fixes
Browse files Browse the repository at this point in the history
Port aayush749 fixes
  • Loading branch information
p-ranav authored Apr 25, 2022
2 parents e0d656e + 67d2e44 commit b9dd1ef
Showing 1 changed file with 9 additions and 21 deletions.
30 changes: 9 additions & 21 deletions include/argparse/argparse.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,10 @@ class ArgumentParser {
*/
void parse_args(const std::vector<std::string> &arguments) {
parse_args_internal(arguments);
parse_args_validate();
// Check if all arguments are parsed
for ([[maybe_unused]] const auto& [unused, argument] : m_argument_map) {
argument->validate();
}
}

/* Main entry point for parsing command-line arguments using this
Expand Down Expand Up @@ -1134,31 +1137,16 @@ class ArgumentParser {
m_is_parsed = true;
}

/*
* @throws std::runtime_error in case of any invalid argument
*/
void parse_args_validate() {
// Check if all arguments are parsed
std::for_each(std::begin(m_argument_map), std::end(m_argument_map),
[](const auto &pair) {
const auto &argument = pair.second;
argument->validate();
});
}

// Used by print_help.
std::size_t get_length_of_longest_argument() const {
if (m_argument_map.empty()) {
return 0;
}
std::vector<std::size_t> argument_lengths(m_argument_map.size());
std::transform(std::begin(m_argument_map), std::end(m_argument_map),
std::begin(argument_lengths), [](const auto &pair) {
const auto &argument = pair.second;
return argument->get_arguments_length();
});
return *std::max_element(std::begin(argument_lengths),
std::end(argument_lengths));
std::size_t max_size = 0;
for ([[maybe_unused]] const auto& [unused, argument] : m_argument_map) {
max_size = std::max(max_size, argument->get_arguments_length());
}
return max_size;
}

using list_iterator = std::list<Argument>::iterator;
Expand Down

0 comments on commit b9dd1ef

Please sign in to comment.