ENH: Better policies for functions and macros

This teaches functions and macros to use policies recorded at creation
time when they are invoked.  It restores the policies as a weak policy
stack entry so that any policies set by a function escape to its caller
as before.

1 files changed, 8 insertions, 0 deletions

diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 2b5223b3af..9095961cf6 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -36,6 +36,7 @@ public:
     // we must copy when we clone
     newC->Args = this->Args;
     newC->Functions = this->Functions;
+    newC->Policies = this->Policies;
     return newC;
   }
 
@@ -81,6 +82,7 @@ public:
 
   std::vector<std::string> Args;
   std::vector<cmListFileFunction> Functions;
+  cmPolicies::PolicyMap Policies;
 };
 
 
@@ -108,6 +110,10 @@ bool cmFunctionHelperCommand::InvokeInitialPass
   cmMakefile::ScopePushPop varScope(this->Makefile);
   static_cast<void>(varScope);
 
+  // Push a weak policy scope which restores the policies recorded at
+  // function creation.
+  cmMakefile::PolicyPushPop polScope(this->Makefile, true, this->Policies);
+
   // set the value of argc
   cmOStringStream strStream;
   strStream << expandedArgs.size();
@@ -165,6 +171,7 @@ bool cmFunctionHelperCommand::InvokeInitialPass
       // The error message should have already included the call stack
       // so we do not need to report an error here.
       lexScope.Quiet();
+      polScope.Quiet();
       inStatus.SetNestedError(true);
       return false;
       }
@@ -206,6 +213,7 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
       cmFunctionHelperCommand *f = new cmFunctionHelperCommand();
       f->Args = this->Args;
       f->Functions = this->Functions;
+      mf.RecordPolicies(f->Policies);
       
       // Set the FilePath on the arguments to match the function since it is
       // not stored and the original values may be freed