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

Refactor: Reduce one more condition checking on handling math compare

Browse Source
This commit is contained in:
Alex Turbov
2021-07-27 18:36:18 +03:00
committed by Brad King
parent 46810235e3
commit 51d9194a96
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmConditionEvaluator.cxx
View File

@@ -619,18 +619,18 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList& newArgs,
double lhs;
double rhs;
bool result;
if (std::sscanf(ldef->c_str(), "%lg", &lhs) != 1 ||
std::sscanf(rdef->c_str(), "%lg", &rhs) != 1) {
result = false;
} else {
auto parseDoubles = [&]() {
return std::sscanf(ldef->c_str(), "%lg", &lhs) == 1 &&
std::sscanf(rdef->c_str(), "%lg", &rhs) == 1;
};
const auto result = parseDoubles() &&
// clang-format off
result = cmRt2CtSelector<
std::less, std::less_equal, std::greater,
std::greater_equal, std::equal_to
cmRt2CtSelector<
std::less, std::less_equal,
std::greater, std::greater_equal,
std::equal_to
>::eval(matchNo, lhs, rhs);
// clang-format on
}
// clang-format on
HandleBinaryOp(result, newArgs, arg, argP1, argP2);
}
@@ -643,8 +643,9 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList& newArgs,
const auto val = (*lhs).compare(*rhs);
// clang-format off
const auto result = cmRt2CtSelector<
std::less, std::less_equal, std::greater,
std::greater_equal, std::equal_to
std::less, std::less_equal,
std::greater, std::greater_equal,
std::equal_to
>::eval(matchNo, val, 0);
// clang-format on
HandleBinaryOp(result, newArgs, arg, argP1, argP2);