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: Get rid of isTrue variable in the while block execution

Browse Source
This commit is contained in:
Alex Turbov
2021-08-10 01:19:56 +03:00
committed by Brad King
parent 4c1cdfd8f0
commit eae125ace5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmWhileCommand.cxx
View File

@@ -81,12 +81,10 @@ bool cmWhileFunctionBlocker::Replay(std::vector<cmListFileFunction> functions,
std::string errorString; std::string errorString;
MessageType messageType; MessageType messageType;
auto isTrue = true;
for (cmConditionEvaluator conditionEvaluator(mf, whileBT); for (cmConditionEvaluator conditionEvaluator(mf, whileBT);
(isTrue = conditionEvaluator.IsTrue(expandArgs(this->Args, expandedArguments),
conditionEvaluator.IsTrue(expandArgs(this->Args, expandedArguments), errorString, messageType);) {
errorString, messageType));) {
// Invoke all the functions that were collected in the block. // Invoke all the functions that were collected in the block.
for (cmListFileFunction const& fn : functions) { for (cmListFileFunction const& fn : functions) {
cmExecutionStatus status(mf); cmExecutionStatus status(mf);
@@ -107,7 +105,7 @@ bool cmWhileFunctionBlocker::Replay(std::vector<cmListFileFunction> functions,
} }
} }
if (!isTrue && !errorString.empty()) { if (!errorString.empty()) {
std::string err = "had incorrect arguments:\n "; std::string err = "had incorrect arguments:\n ";
for (auto const& i : expandedArguments) { for (auto const& i : expandedArguments) {
err += " "; err += " ";