mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Make cmConditionEvaluator::IsTrue a bit more compact

Browse Source 
Signed-off-by: Alex Turbov <i.zaufi@gmail.com>
This commit is contained in:
Alex Turbov
2021-07-26 01:54:24 +03:00
committed by Brad King
parent 18bd6c98ea
commit b0d6596399
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmConditionEvaluator.cxx
View File

@@ -149,25 +149,19 @@ bool cmConditionEvaluator::IsTrue(
// now loop through the arguments and see if we can reduce any of them
// we do this multiple times. Once for each level of precedence
// parens
if (!this->HandleLevel0(newArgs, errorString, status)) {
return false;
}
// predicates
if (!this->HandleLevel1(newArgs, errorString, status)) {
return false;
}
// binary ops
if (!this->HandleLevel2(newArgs, errorString, status)) {
return false;
}
// NOT
if (!this->HandleLevel3(newArgs, errorString, status)) {
return false;
}
// AND OR
if (!this->HandleLevel4(newArgs, errorString, status)) {
return false;
using handlerFn_t = bool (cmConditionEvaluator::*)(
cmArgumentList&, std::string&, MessageType&);
const std::array<handlerFn_t, 5> handlers = { {
&cmConditionEvaluator::HandleLevel0, // parenthesis
&cmConditionEvaluator::HandleLevel1, // predicates
&cmConditionEvaluator::HandleLevel2, // binary ops
&cmConditionEvaluator::HandleLevel3, // NOT
&cmConditionEvaluator::HandleLevel4 // AND OR
} };
for (auto fn : handlers) {
if (!(this->*fn)(newArgs, errorString, status)) {
return false;
}
}
// now at the end there should only be one argument left