riyyi/manafiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Util: Handle accepting values return state in ArgParser

Browse Source
This commit is contained in:
Riyyi
2021-09-06 12:17:12 +02:00
parent 1366bf14b1
commit 98dec3e51a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/argparser.cpp
+8 -8
View File
@@ -77,7 +77,7 @@ bool ArgParser::parseShortOption(std::string_view option, std::string_view next)
if (foundOption->requiresArgument == Required::No) { if (foundOption->requiresArgument == Required::No) {
// FIXME: Figure out why providing a nullptr breaks the lambda here. // FIXME: Figure out why providing a nullptr breaks the lambda here.
foundOption->acceptValue(""); result = foundOption->acceptValue("");
} }
else if (foundOption->requiresArgument == Required::Yes) { else if (foundOption->requiresArgument == Required::Yes) {
value = option.substr(i + 1); value = option.substr(i + 1);
@@ -91,7 +91,7 @@ bool ArgParser::parseShortOption(std::string_view option, std::string_view next)
} }
} }
else if (!value.empty()) { else if (!value.empty()) {
foundOption->acceptValue(value.data()); result = foundOption->acceptValue(value.data());
} }
else if (next[0] == '-') { else if (next[0] == '-') {
foundOption->error = Error::RequiresArgument; foundOption->error = Error::RequiresArgument;
@@ -103,7 +103,7 @@ bool ArgParser::parseShortOption(std::string_view option, std::string_view next)
} }
} }
else { else {
foundOption->acceptValue(next.data()); result = foundOption->acceptValue(next.data());
m_optionIndex++; m_optionIndex++;
} }
@@ -112,7 +112,7 @@ bool ArgParser::parseShortOption(std::string_view option, std::string_view next)
else if (foundOption->requiresArgument == Required::Optional) { else if (foundOption->requiresArgument == Required::Optional) {
value = option.substr(i + 1); value = option.substr(i + 1);
if (!value.empty()) { if (!value.empty()) {
foundOption->acceptValue(value.data()); result = foundOption->acceptValue(value.data());
break; break;
} }
} }
@@ -162,10 +162,10 @@ bool ArgParser::parseLongOption(std::string_view option, std::string_view next)
} }
} }
else if (foundOption->requiresArgument == Required::Yes) { else if (foundOption->requiresArgument == Required::Yes) {
foundOption->acceptValue(value.data()); result = foundOption->acceptValue(value.data());
} }
else if (foundOption->requiresArgument == Required::Optional) { else if (foundOption->requiresArgument == Required::Optional) {
foundOption->acceptValue(value.data()); result = foundOption->acceptValue(value.data());
} }
} }
else if (!next.empty() && foundOption->requiresArgument == Required::Yes) { else if (!next.empty() && foundOption->requiresArgument == Required::Yes) {
@@ -179,7 +179,7 @@ bool ArgParser::parseLongOption(std::string_view option, std::string_view next)
} }
} }
else { else {
foundOption->acceptValue(next.data()); result = foundOption->acceptValue(next.data());
m_optionIndex++; m_optionIndex++;
} }
} }
@@ -194,7 +194,7 @@ bool ArgParser::parseLongOption(std::string_view option, std::string_view next)
} }
else { else {
// FIXME: Figure out why providing a nullptr breaks the lambda here. // FIXME: Figure out why providing a nullptr breaks the lambda here.
foundOption->acceptValue(""); result = foundOption->acceptValue("");
} }
return result; return result;