summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/cmBreakCommand.cxx2
-rw-r--r--Source/cmContinueCommand.cxx2
-rw-r--r--Source/cmExecutionStatus.h31
-rw-r--r--Source/cmForEachCommand.cxx2
-rw-r--r--Source/cmFunctionCommand.cxx2
-rw-r--r--Source/cmIfCommand.cxx6
-rw-r--r--Source/cmMacroCommand.cxx6
-rw-r--r--Source/cmMakefile.cxx2
-rw-r--r--Source/cmReturnCommand.cxx2
-rw-r--r--Source/cmWhileCommand.cxx2
10 files changed, 32 insertions, 25 deletions
diff --git a/Source/cmBreakCommand.cxx b/Source/cmBreakCommand.cxx
index 9bb6137..3772c6f 100644
--- a/Source/cmBreakCommand.cxx
+++ b/Source/cmBreakCommand.cxx
@@ -41,7 +41,7 @@ bool cmBreakCommand::InitialPass(std::vector<std::string> const& args,
}
}
- status.SetBreakInvoked(true);
+ status.SetBreakInvoked();
if (!args.empty()) {
bool issueMessage = true;
diff --git a/Source/cmContinueCommand.cxx b/Source/cmContinueCommand.cxx
index 53d035d..2298a05 100644
--- a/Source/cmContinueCommand.cxx
+++ b/Source/cmContinueCommand.cxx
@@ -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,
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index fd3c416..ac5fe1d 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -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;
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index 6273f6e..8346b23 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -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;
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 31adcb7..e5fe988 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -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()) {
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 421c3dd..0972664 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -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;
}
}
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 583f801..4830371 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -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;
}
}
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index cb11060..3569abe 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -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());
diff --git a/Source/cmReturnCommand.cxx b/Source/cmReturnCommand.cxx
index f8b3129..ceea8b4 100644
--- a/Source/cmReturnCommand.cxx
+++ b/Source/cmReturnCommand.cxx
@@ -8,6 +8,6 @@
bool cmReturnCommand::InitialPass(std::vector<std::string> const&,
cmExecutionStatus& status)
{
- status.SetReturnInvoked(true);
+ status.SetReturnInvoked();
return true;
}
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 38ea637..24d7bf1 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -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()) {
generated by cgit v0.12 at 2024-11-11 07:14:48 (GMT)