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

Record used names with copies of string_view

Browse Source
This commit is contained in:
Zhihao Yuan 2020-01-02 01:56:31 -06:00
parent 03a0ce831d
commit 7c57e1e852
No known key found for this signature in database
GPG Key ID: A2E474BDAA37E11C
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/argparse.hpp
View File

@ -373,12 +373,13 @@ public:
} }
template <typename Iterator> template <typename Iterator>
Iterator consume(Iterator start, Iterator end, std::string usedName = {}) { Iterator consume(Iterator start, Iterator end,
std::string_view usedName = {}) {
if (mIsUsed) { if (mIsUsed) {
throw std::runtime_error("Duplicate argument"); throw std::runtime_error("Duplicate argument");
} }
mIsUsed = true; mIsUsed = true;
mUsedName = std::move(usedName); mUsedName = usedName;
if (mNumArgs == 0) { if (mNumArgs == 0) {
mValues.emplace_back(mImplicitValue); mValues.emplace_back(mImplicitValue);
return start; return start;
@ -721,7 +722,7 @@ private:
} }
std::vector<std::string> mNames; std::vector<std::string> mNames;
std::string mUsedName; std::string_view mUsedName;
std::string mHelp; std::string mHelp;
std::any mDefaultValue; std::any mDefaultValue;
std::any mImplicitValue; std::any mImplicitValue;
@ -932,7 +933,7 @@ private:
std::exit(0); std::exit(0);
} }
it = tArgument->consume(std::next(it), end, tCurrentArgument); it = tArgument->consume(std::next(it), end, tIterator->first);
} else if (const auto &tCompoundArgument = tCurrentArgument; } else if (const auto &tCompoundArgument = tCurrentArgument;
tCompoundArgument.size() > 1 && tCompoundArgument[0] == '-' && tCompoundArgument.size() > 1 && tCompoundArgument[0] == '-' &&
tCompoundArgument[1] != '-') { tCompoundArgument[1] != '-') {
@ -942,7 +943,7 @@ private:
auto tIterator2 = mArgumentMap.find(tHypotheticalArgument); auto tIterator2 = mArgumentMap.find(tHypotheticalArgument);
if (tIterator2 != mArgumentMap.end()) { if (tIterator2 != mArgumentMap.end()) {
auto tArgument = tIterator2->second; auto tArgument = tIterator2->second;
it = tArgument->consume(it, end, tHypotheticalArgument); it = tArgument->consume(it, end, tIterator2->first);
} else { } else {
throw std::runtime_error("Unknown argument"); throw std::runtime_error("Unknown argument");
} }