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

First check for positional, then optional and compound

Browse Source
This commit is contained in:
Stephan van Veen 2019-05-18 11:54:06 +02:00
parent 44bef34e79
commit d95f9d9f14
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/argparse.hpp
View File

@ -204,6 +204,10 @@ public:
return (!aName.empty() && aName[0] == '-'); return (!aName.empty() && aName[0] == '-');
} }
static bool is_positional(const std::string& aName) {
return !is_optional(aName);
}
/* /*
* Getter for template non-container types * Getter for template non-container types
* @throws std::logic_error in case of incompatible types * @throws std::logic_error in case of incompatible types
@ -436,18 +440,17 @@ class ArgumentParser {
if (tCurrentArgument == Argument::mHelpOption || tCurrentArgument == Argument::mHelpOptionLong) { if (tCurrentArgument == Argument::mHelpOption || tCurrentArgument == Argument::mHelpOptionLong) {
throw std::runtime_error("help called"); throw std::runtime_error("help called");
} }
auto tIterator = mArgumentMap.find(tCurrentArgument); if (Argument::is_positional(tCurrentArgument)) {
if (tIterator != mArgumentMap.end()) {
auto tArgument = tIterator->second;
it = tArgument->consume(std::next(it), end, tCurrentArgument);
}
else if (!Argument::is_optional(tCurrentArgument)) {
if (mNextPositionalArgument >= mPositionalArguments.size()) { if (mNextPositionalArgument >= mPositionalArguments.size()) {
throw std::runtime_error("Maximum number of positional arguments exceeded"); throw std::runtime_error("Maximum number of positional arguments exceeded");
} }
auto tArgument = mPositionalArguments[mNextPositionalArgument++]; auto tArgument = mPositionalArguments[mNextPositionalArgument++];
it = tArgument->consume(it, end); it = tArgument->consume(it, end);
} }
else if (auto tIterator = mArgumentMap.find(tCurrentArgument); tIterator != mArgumentMap.end()) {
auto tArgument = tIterator->second;
it = tArgument->consume(std::next(it), end, tCurrentArgument);
}
else { // TODO: compound optional arguments else { // TODO: compound optional arguments
++it; ++it;
} }