mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'correct_arg_parsing'

Browse Source 
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
This commit is contained in:
Brad King
2021-03-29 13:29:30 +00:00
committed by Kitware Robot
parent d5ab6a53ed 79d7bcaf40
commit c4f8005454
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmCommandLineArgument.h
+9 -5
View File
@@ -76,8 +76,9 @@ struct cmCommandLineArgument
} else if (this->Type == Values::One || this->Type == Values::ZeroOrOne) {
if (input.size() == this->Name.size()) {
++index;
if (index >= allArgs.size() || allArgs[index][0] == '-') {
auto nextValueIndex = index + 1;
if (nextValueIndex >= allArgs.size() ||
allArgs[nextValueIndex][0] == '-') {
if (this->Type == Values::ZeroOrOne) {
parseState =
this->StoreCall(std::string{}, std::forward<CallState>(state)...)
@@ -87,10 +88,11 @@ struct cmCommandLineArgument
parseState = ParseMode::ValueError;
}
} else {
parseState =
this->StoreCall(allArgs[index], std::forward<CallState>(state)...)
parseState = this->StoreCall(allArgs[nextValueIndex],
std::forward<CallState>(state)...)
? ParseMode::Valid
: ParseMode::Invalid;
index = nextValueIndex;
}
} else {
// parse the string to get the value
@@ -137,7 +139,8 @@ struct cmCommandLineArgument
} else if (this->Type == Values::OneOrMore) {
if (input.size() == this->Name.size()) {
auto nextValueIndex = index + 1;
if (nextValueIndex >= allArgs.size() || allArgs[index + 1][0] == '-') {
if (nextValueIndex >= allArgs.size() ||
allArgs[nextValueIndex][0] == '-') {
parseState = ParseMode::ValueError;
} else {
std::string buffer = allArgs[nextValueIndex++];
@@ -149,6 +152,7 @@ struct cmCommandLineArgument
this->StoreCall(buffer, std::forward<CallState>(state)...)
? ParseMode::Valid
: ParseMode::Invalid;
index = (nextValueIndex - 1);
}
}
}