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

Merge pull request #209 from skrobinson/fix-issue-208

Browse Source 
Fix issue 208
This commit is contained in:
Pranav 2022-09-23 12:57:02 -05:00 committed by GitHub
commit e9ae471ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/argparse/argparse.hpp
View File

@ -597,7 +597,7 @@ public:
std::string get_inline_usage() const { std::string get_inline_usage() const {
std::stringstream usage; std::stringstream usage;
// Find the longest variant to show in the usage string // Find the longest variant to show in the usage string
std::string longest_name = m_names[0]; std::string longest_name = m_names.front();
for (const auto &s : m_names) { for (const auto &s : m_names) {
if (s.size() > longest_name.size()) { if (s.size() > longest_name.size()) {
longest_name = s; longest_name = s;
@ -758,6 +758,8 @@ private:
std::stringstream stream; std::stringstream stream;
if (!m_used_name.empty()) { if (!m_used_name.empty()) {
stream << m_used_name << ": "; stream << m_used_name << ": ";
} else {
stream << m_names.front() << ": ";
} }
if (m_num_args_range.is_exact()) { if (m_num_args_range.is_exact()) {
stream << m_num_args_range.get_min(); stream << m_num_args_range.get_min();
@ -773,7 +775,7 @@ private:
void throw_required_arg_not_used_error() const { void throw_required_arg_not_used_error() const {
std::stringstream stream; std::stringstream stream;
stream << m_names[0] << ": required."; stream << m_names.front() << ": required.";
throw std::runtime_error(stream.str()); throw std::runtime_error(stream.str());
} }
@ -1341,9 +1343,9 @@ public:
// Add any options inline here // Add any options inline here
for (const auto &argument : this->m_optional_arguments) { for (const auto &argument : this->m_optional_arguments) {
if (argument.m_names[0] == "-v") { if (argument.m_names.front() == "-v") {
continue; continue;
} else if (argument.m_names[0] == "-h") { } else if (argument.m_names.front() == "-h") {
stream << " [-h]"; stream << " [-h]";
} else { } else {
stream << " " << argument.get_inline_usage(); stream << " " << argument.get_inline_usage();

2
test/test_positional_arguments.cpp
View File

@ -18,7 +18,7 @@ TEST_CASE("Missing expected positional argument" *
argparse::ArgumentParser program("test"); argparse::ArgumentParser program("test");
program.add_argument("input"); program.add_argument("input");
REQUIRE_THROWS_WITH_AS(program.parse_args({"test"}), REQUIRE_THROWS_WITH_AS(program.parse_args({"test"}),
"1 argument(s) expected. 0 provided.", "input: 1 argument(s) expected. 0 provided.",
std::runtime_error); std::runtime_error);
} }