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

Put error message into exception instead of printing

Browse Source
This commit is contained in:
Stephan van Veen 2019-05-11 12:45:10 +02:00
parent 3c65c5dcab
commit 42ff186743
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/argparse.hpp
View File

@ -564,9 +564,10 @@ class ArgumentParser {
// This is a positional argument. // This is a positional argument.
// Parse and save into mPositionalArguments vector // Parse and save into mPositionalArguments vector
if (mNextPositionalArgument >= mPositionalArguments.size()) { if (mNextPositionalArgument >= mPositionalArguments.size()) {
std::cout << "error: unexpected positional argument " << argv[i] << std::endl; std::stringstream stream;
stream << "error: unexpected positional argument " << argv[i] << std::endl;
print_help(); print_help();
throw std::runtime_error("unexpected positional argument"); throw std::runtime_error(stream.str());
} }
auto tArgument = mPositionalArguments[mNextPositionalArgument]; auto tArgument = mPositionalArguments[mNextPositionalArgument];
auto tCount = tArgument->mNumArgs - tArgument->mRawValues.size(); auto tCount = tArgument->mNumArgs - tArgument->mRawValues.size();
@ -605,11 +606,12 @@ class ArgumentParser {
// Check if all positional arguments are parsed // Check if all positional arguments are parsed
for (const auto& tArgument : mPositionalArguments) { for (const auto& tArgument : mPositionalArguments) {
if (tArgument->mValues.size() != tArgument->mNumArgs) { if (tArgument->mValues.size() != tArgument->mNumArgs) {
std::cout << "error: " << tArgument->mUsedName << ": expected " std::stringstream stream;
stream << "error: " << tArgument->mUsedName << ": expected "
<< tArgument->mNumArgs << (tArgument->mNumArgs == 1 ? " argument. " : " arguments. ") << tArgument->mNumArgs << (tArgument->mNumArgs == 1 ? " argument. " : " arguments. ")
<< tArgument->mValues.size() << " provided.\n" << std::endl; << tArgument->mValues.size() << " provided.\n" << std::endl;
print_help(); print_help();
throw std::runtime_error("wrong number of arguments"); throw std::runtime_error(stream.str());
} }
} }
@ -620,11 +622,12 @@ class ArgumentParser {
// All cool if there's a default value to return // All cool if there's a default value to return
// If no default value, then there's a problem // If no default value, then there's a problem
if (!tArgument->mDefaultValue.has_value()) { if (!tArgument->mDefaultValue.has_value()) {
std::cout << "error: " << tArgument->mUsedName << ": expected " std::stringstream stream;
stream << "error: " << tArgument->mUsedName << ": expected "
<< tArgument->mNumArgs << (tArgument->mNumArgs == 1 ? " argument. " : " arguments. ") << tArgument->mNumArgs << (tArgument->mNumArgs == 1 ? " argument. " : " arguments. ")
<< tArgument->mValues.size() << " provided.\n" << std::endl; << tArgument->mValues.size() << " provided.\n" << std::endl;
print_help(); print_help();
throw std::runtime_error("wrong number of arguments"); throw std::runtime_error(stream.str());
} }
} }
} }
@ -675,6 +678,7 @@ class ArgumentParser {
try { \ try { \
parser.parse_args(argc, argv); \ parser.parse_args(argc, argv); \
} catch (const std::runtime_error& err) { \ } catch (const std::runtime_error& err) { \
std::cerr << err.what() << std::endl; \
exit(0); \ exit(0); \
} }