mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 22:30:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Rewrite parenthesis scanner to avoid ifs

Browse Source 
Signed-off-by: Alex Turbov <i.zaufi@gmail.com>
This commit is contained in:
Alex Turbov
2021-07-25 03:41:26 +03:00
parent 135c37bdd7
commit 95fc27cedd
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmConditionEvaluator.cxx
+5 -12
View File
@@ -362,18 +362,11 @@ bool cmConditionEvaluator::HandleLevel0(cmArgumentList& newArgs,
for (auto arg = newArgs.begin(); arg != newArgs.end(); ++arg) {
if (this->IsKeyword(keyParenL, *arg)) {
// search for the closing paren for this opening one
cmArgumentList::iterator argClose;
argClose = arg;
argClose++;
auto depth = 1u;
while (argClose != newArgs.end() && depth) {
if (this->IsKeyword(keyParenL, *argClose)) {
depth++;
}
if (this->IsKeyword(keyParenR, *argClose)) {
depth--;
}
argClose++;
auto depth = 1;
auto argClose = std::next(arg);
for (; argClose != newArgs.end() && depth; ++argClose) {
depth += int(this->IsKeyword(keyParenL, *argClose)) -
int(this->IsKeyword(keyParenR, *argClose));
}
if (depth) {
errorString = "mismatched parenthesis in condition";