CMake/Source/cmWhileCommand.cxx
Brad King 5d85fb4f40 Fix assertion failure on unmatched function or macro
The fix in commit v3.2.3~3^2 (Fix assertion failure on unmatched foreach
in function, 2015-05-18) broke handling of unmatched non-loop blocks
because it assumed all function blockers removed during error unwinding
were for loops, essentially switching the set of mishandled cases.

The purpose of the loop block push/pop operations is to define a scope
matching the lifetime of the loop function blockers.  Since our function
blockers already have the proper lifetime, simply move the push/pop
operations to their constructor/destructor.

Extend the RunCMake.Syntax test with a case covering this.
2015-06-22 11:41:51 -04:00

159 lines
4.4 KiB
C++

/*============================================================================
CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
#include "cmWhileCommand.h"
#include "cmConditionEvaluator.h"
cmWhileFunctionBlocker::cmWhileFunctionBlocker(cmMakefile* mf):
Makefile(mf), Depth(0)
{
this->Makefile->PushLoopBlock();
}
cmWhileFunctionBlocker::~cmWhileFunctionBlocker()
{
this->Makefile->PopLoopBlock();
}
bool cmWhileFunctionBlocker::
IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
cmExecutionStatus &inStatus)
{
// at end of for each execute recorded commands
if (!cmSystemTools::Strucmp(lff.Name.c_str(),"while"))
{
// record the number of while commands past this one
this->Depth++;
}
else if (!cmSystemTools::Strucmp(lff.Name.c_str(),"endwhile"))
{
// if this is the endwhile for this while loop then execute
if (!this->Depth)
{
// Remove the function blocker for this scope or bail.
cmsys::auto_ptr<cmFunctionBlocker>
fb(mf.RemoveFunctionBlocker(this, lff));
if(!fb.get()) { return false; }
std::string errorString;
std::vector<cmExpandedCommandArgument> expandedArguments;
mf.ExpandArguments(this->Args, expandedArguments);
cmake::MessageType messageType;
cmConditionEvaluator conditionEvaluator(mf);
bool isTrue = conditionEvaluator.IsTrue(
expandedArguments, errorString, messageType);
while (isTrue)
{
if (!errorString.empty())
{
std::string err = "had incorrect arguments: ";
unsigned int i;
for(i =0; i < this->Args.size(); ++i)
{
err += (this->Args[i].Delim?"\"":"");
err += this->Args[i].Value;
err += (this->Args[i].Delim?"\"":"");
err += " ";
}
err += "(";
err += errorString;
err += ").";
mf.IssueMessage(messageType, err);
if (messageType == cmake::FATAL_ERROR)
{
cmSystemTools::SetFatalErrorOccured();
return true;
}
}
// Invoke all the functions that were collected in the block.
for(unsigned int c = 0; c < this->Functions.size(); ++c)
{
cmExecutionStatus status;
mf.ExecuteCommand(this->Functions[c],status);
if (status.GetReturnInvoked())
{
inStatus.SetReturnInvoked(true);
return true;
}
if (status.GetBreakInvoked())
{
return true;
}
if (status.GetContinueInvoked())
{
break;
}
if(cmSystemTools::GetFatalErrorOccured() )
{
return true;
}
}
expandedArguments.clear();
mf.ExpandArguments(this->Args, expandedArguments);
isTrue = conditionEvaluator.IsTrue(
expandedArguments, errorString, messageType);
}
return true;
}
else
{
// decrement for each nested while that ends
this->Depth--;
}
}
// record the command
this->Functions.push_back(lff);
// always return true
return true;
}
bool cmWhileFunctionBlocker::
ShouldRemove(const cmListFileFunction& lff, cmMakefile& )
{
if(!cmSystemTools::Strucmp(lff.Name.c_str(),"endwhile"))
{
// if the endwhile has arguments, then make sure
// they match the arguments of the matching while
if (lff.Arguments.empty() ||
lff.Arguments == this->Args)
{
return true;
}
}
return false;
}
bool cmWhileCommand
::InvokeInitialPass(const std::vector<cmListFileArgument>& args,
cmExecutionStatus &)
{
if(args.size() < 1)
{
this->SetError("called with incorrect number of arguments");
return false;
}
// create a function blocker
cmWhileFunctionBlocker *f = new cmWhileFunctionBlocker(this->Makefile);
f->Args = args;
this->Makefile->AddFunctionBlocker(f);
return true;
}