echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Deduplicate code for AND and OR handling in if() command

Browse Source 
Signed-off-by: Alex Turbov <i.zaufi@gmail.com>
This commit is contained in:
Alex Turbov 2021-07-25 03:50:52 +03:00
parent 95fc27cedd
commit 314538703a
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmConditionEvaluator.cxx
View File

@ -687,29 +687,22 @@ bool cmConditionEvaluator::HandleLevel4(cmArgumentList& newArgs,
MessageType& status) MessageType& status)
{ {
bool reducible; bool reducible;
bool lhs;
bool rhs;
do { do {
reducible = false; reducible = false;
for (auto arg = newArgs.begin(), argP1 = arg, argP2 = arg; for (auto arg = newArgs.begin(), argP1 = arg, argP2 = arg;
arg != newArgs.end(); argP1 = ++arg) { arg != newArgs.end(); argP1 = ++arg) {
IncrementArguments(newArgs, argP1, argP2); IncrementArguments(newArgs, argP1, argP2);
if (argP1 != newArgs.end() && this->IsKeyword(keyAND, *argP1) && if (argP1 != newArgs.end() &&
(this->IsKeyword(keyAND, *argP1) ||
this->IsKeyword(keyOR, *argP1)) &&
argP2 != newArgs.end()) { argP2 != newArgs.end()) {
lhs = const auto lhs =
this->GetBooleanValueWithAutoDereference(*arg, errorString, status); this->GetBooleanValueWithAutoDereference(*arg, errorString, status);
rhs = this->GetBooleanValueWithAutoDereference(*argP2, errorString, const auto rhs = this->GetBooleanValueWithAutoDereference(
status); *argP2, errorString, status);
HandleBinaryOp((lhs && rhs), reducible, arg, newArgs, argP1, argP2); HandleBinaryOp(this->IsKeyword(keyAND, *argP1) ? (lhs && rhs)
} : (lhs || rhs),
reducible, arg, newArgs, argP1, argP2);
if (argP1 != newArgs.end() && this->IsKeyword(keyOR, *argP1) &&
argP2 != newArgs.end()) {
lhs =
this->GetBooleanValueWithAutoDereference(*arg, errorString, status);
rhs = this->GetBooleanValueWithAutoDereference(*argP2, errorString,
status);
HandleBinaryOp((lhs || rhs), reducible, arg, newArgs, argP1, argP2);
} }
} }
} while (reducible); } while (reducible);