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

cmExecutionStatus: Remove arguments from setters

Browse Source 
The setters are only used to set boolean values.  The values are never
reset individually.
This commit is contained in:
Daniel Pfeifer 2016-12-26 10:30:31 +01:00
parent 0c519c7029
commit 67a8d907ad
10 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmBreakCommand.cxx
View File

@ -41,7 +41,7 @@ bool cmBreakCommand::InitialPass(std::vector<std::string> const& args,
}
}
status.SetBreakInvoked(true);
status.SetBreakInvoked();
if (!args.empty()) {
bool issueMessage = true;

2
Source/cmContinueCommand.cxx
View File

@ -19,7 +19,7 @@ bool cmContinueCommand::InitialPass(std::vector<std::string> const& args,
return true;
}
status.SetContinueInvoked(true);
status.SetContinueInvoked();
if (!args.empty()) {
this->Makefile->IssueMessage(cmake::FATAL_ERROR,

31
Source/cmExecutionStatus.h
View File

@ -11,16 +11,13 @@
class cmExecutionStatus
{
public:
cmExecutionStatus() { this->Clear(); }
void SetReturnInvoked(bool val) { this->ReturnInvoked = val; }
bool GetReturnInvoked() { return this->ReturnInvoked; }
void SetBreakInvoked(bool val) { this->BreakInvoked = val; }
bool GetBreakInvoked() { return this->BreakInvoked; }
void SetContinueInvoked(bool val) { this->ContinueInvoked = val; }
bool GetContinueInvoked() { return this->ContinueInvoked; }
cmExecutionStatus()
: ReturnInvoked(false)
, BreakInvoked(false)
, ContinueInvoked(false)
, NestedError(false)
{
}
void Clear()
{
@ -29,8 +26,18 @@ public:
this->ContinueInvoked = false;
this->NestedError = false;
}
void SetNestedError(bool val) { this->NestedError = val; }
bool GetNestedError() { return this->NestedError; }
void SetReturnInvoked() { this->ReturnInvoked = true; }
bool GetReturnInvoked() const { return this->ReturnInvoked; }
void SetBreakInvoked() { this->BreakInvoked = true; }
bool GetBreakInvoked() const { return this->BreakInvoked; }
void SetContinueInvoked() { this->ContinueInvoked = true; }
bool GetContinueInvoked() const { return this->ContinueInvoked; }
void SetNestedError() { this->NestedError = true; }
bool GetNestedError() const { return this->NestedError; }
private:
bool ReturnInvoked;

2
Source/cmForEachCommand.cxx
View File

@ -58,7 +58,7 @@ bool cmForEachFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
status.Clear();
mf.ExecuteCommand(this->Functions[c], status);
if (status.GetReturnInvoked()) {
inStatus.SetReturnInvoked(true);
inStatus.SetReturnInvoked();
// restore the variable to its prior value
mf.AddDefinition(this->Args[0], oldDef.c_str());
return true;

2
Source/cmFunctionCommand.cxx
View File

@ -126,7 +126,7 @@ bool cmFunctionHelperCommand::InvokeInitialPass(
// The error message should have already included the call stack
// so we do not need to report an error here.
functionScope.Quiet();
inStatus.SetNestedError(true);
inStatus.SetNestedError();
return false;
}
if (status.GetReturnInvoked()) {

6
Source/cmIfCommand.cxx
View File

@ -137,15 +137,15 @@ bool cmIfFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
status.Clear();
mf.ExecuteCommand(this->Functions[c], status);
if (status.GetReturnInvoked()) {
inStatus.SetReturnInvoked(true);
inStatus.SetReturnInvoked();
return true;
}
if (status.GetBreakInvoked()) {
inStatus.SetBreakInvoked(true);
inStatus.SetBreakInvoked();
return true;
}
if (status.GetContinueInvoked()) {
inStatus.SetContinueInvoked(true);
inStatus.SetContinueInvoked();
return true;
}
}

6
Source/cmMacroCommand.cxx
View File

@ -156,15 +156,15 @@ bool cmMacroHelperCommand::InvokeInitialPass(
// The error message should have already included the call stack
// so we do not need to report an error here.
macroScope.Quiet();
inStatus.SetNestedError(true);
inStatus.SetNestedError();
return false;
}
if (status.GetReturnInvoked()) {
inStatus.SetReturnInvoked(true);
inStatus.SetReturnInvoked();
return true;
}
if (status.GetBreakInvoked()) {
inStatus.SetBreakInvoked(true);
inStatus.SetBreakInvoked();
return true;
}
}

2
Source/cmMakefile.cxx
View File

@ -118,7 +118,7 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
{
if (!this->ExecutionStatusStack.empty()) {
if ((t == cmake::FATAL_ERROR) || (t == cmake::INTERNAL_ERROR)) {
this->ExecutionStatusStack.back()->SetNestedError(true);
this->ExecutionStatusStack.back()->SetNestedError();
}
}
this->GetCMakeInstance()->IssueMessage(t, text, this->GetBacktrace());

2
Source/cmReturnCommand.cxx
View File

@ -8,6 +8,6 @@
bool cmReturnCommand::InitialPass(std::vector<std::string> const&,
cmExecutionStatus& status)
{
status.SetReturnInvoked(true);
status.SetReturnInvoked();
return true;
}

2
Source/cmWhileCommand.cxx
View File

@ -82,7 +82,7 @@ bool cmWhileFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
cmExecutionStatus status;
mf.ExecuteCommand(this->Functions[c], status);
if (status.GetReturnInvoked()) {
inStatus.SetReturnInvoked(true);
inStatus.SetReturnInvoked();
return true;
}
if (status.GetBreakInvoked()) {