Commit 2379b3ae authored by Brad King's avatar Brad King

cmConditionEvaluator: Remove GetConditionContext method

All it does is call cmListFileContext::FromCommandContext, so move this
to the call sites.
parent 02fce523
......@@ -104,18 +104,6 @@ bool cmConditionEvaluator::IsTrue(
errorString, status, true);
}
cmListFileContext cmConditionEvaluator::GetConditionContext(
cmMakefile*,
const cmCommandContext& command,
const std::string& filePath)
{
cmListFileContext context =
cmListFileContext::FromCommandContext(
command,
filePath);
return context;
}
//=========================================================================
const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
cmExpandedCommandArgument const& argument) const
......
......@@ -33,9 +33,6 @@ public:
std::string &errorString,
cmake::MessageType &status);
static cmListFileContext GetConditionContext(cmMakefile* mf,
const cmCommandContext& command, std::string const& filePath);
private:
// Filter the given variable definition based on policy CMP0054.
const char* GetDefinitionIfUnquoted(
......
......@@ -108,8 +108,8 @@ IsFunctionBlocked(const cmListFileFunction& lff,
cmake::MessageType messType;
cmListFileContext conditionContext =
cmConditionEvaluator::GetConditionContext(
&mf, this->Functions[c],
cmListFileContext::FromCommandContext(
this->Functions[c],
this->GetStartingContext().FilePath);
cmConditionEvaluator conditionEvaluator(
......@@ -210,8 +210,8 @@ bool cmIfCommand
commandContext.Name = execContext.Name;
cmConditionEvaluator conditionEvaluator(
*(this->Makefile), cmConditionEvaluator::GetConditionContext(
this->Makefile, commandContext, execContext.FilePath),
*(this->Makefile), cmListFileContext::FromCommandContext(
commandContext, execContext.FilePath),
this->Makefile->GetBacktrace());
bool isTrue = conditionEvaluator.IsTrue(
......
......@@ -56,8 +56,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
commandContext.Name = execContext.Name;
cmListFileContext conditionContext =
cmConditionEvaluator::GetConditionContext(
&mf, commandContext,
cmListFileContext::FromCommandContext(
commandContext,
this->GetStartingContext().FilePath);
cmConditionEvaluator conditionEvaluator(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment