1 files changed, 54 insertions, 82 deletions

diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 36831fe..2caa401 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -29,17 +29,14 @@ public:
    * cmMacroHelperCommand and cmFunctionHelperCommand
    * which cannot provide appropriate documentation.
    */
-  virtual bool ShouldAppearInDocumentation() const
-    {
-    return false;
-    }
+  virtual bool ShouldAppearInDocumentation() const { return false; }
 
   /**
    * This is a virtual constructor for the command.
    */
   virtual cmCommand* Clone()
   {
-    cmMacroHelperCommand *newC = new cmMacroHelperCommand;
+    cmMacroHelperCommand* newC = new cmMacroHelperCommand;
     // we must copy when we clone
     newC->Args = this->Args;
     newC->Functions = this->Functions;
@@ -58,10 +55,12 @@ public:
    * the CMakeLists.txt file.
    */
   virtual bool InvokeInitialPass(const std::vector<cmListFileArgument>& args,
-                                 cmExecutionStatus &);
+                                 cmExecutionStatus&);
 
-  virtual bool InitialPass(std::vector<std::string> const&,
-                           cmExecutionStatus &) { return false; }
+  virtual bool InitialPass(std::vector<std::string> const&, cmExecutionStatus&)
+  {
+    return false;
+  }
 
   /**
    * The name of the command as specified in CMakeList.txt.
@@ -76,10 +75,8 @@ public:
   std::string FilePath;
 };
 
-
-bool cmMacroHelperCommand::InvokeInitialPass
-(const std::vector<cmListFileArgument>& args,
- cmExecutionStatus &inStatus)
+bool cmMacroHelperCommand::InvokeInitialPass(
+  const std::vector<cmListFileArgument>& args, cmExecutionStatus& inStatus)
 {
   // Expand the argument list to the macro.
   std::vector<std::string> expandedArgs;
@@ -87,17 +84,15 @@ bool cmMacroHelperCommand::InvokeInitialPass
 
   // make sure the number of arguments passed is at least the number
   // required by the signature
-  if (expandedArgs.size() < this->Args.size() - 1)
-    {
+  if (expandedArgs.size() < this->Args.size() - 1) {
     std::string errorMsg =
       "Macro invoked with incorrect arguments for macro named: ";
     errorMsg += this->Args[0];
     this->SetError(errorMsg);
     return false;
-    }
+  }
 
-  cmMakefile::MacroPushPop macroScope(this->Makefile,
-                                      this->FilePath,
+  cmMakefile::MacroPushPop macroScope(this->Makefile, this->FilePath,
                                       this->Policies);
 
   // set the value of argc
@@ -105,29 +100,26 @@ bool cmMacroHelperCommand::InvokeInitialPass
   argcDefStream << expandedArgs.size();
   std::string argcDef = argcDefStream.str();
 
-  std::vector<std::string>::const_iterator eit
-      = expandedArgs.begin() + (this->Args.size() - 1);
+  std::vector<std::string>::const_iterator eit =
+    expandedArgs.begin() + (this->Args.size() - 1);
   std::string expandedArgn = cmJoin(cmMakeRange(eit, expandedArgs.end()), ";");
   std::string expandedArgv = cmJoin(expandedArgs, ";");
   std::vector<std::string> variables;
   variables.reserve(this->Args.size() - 1);
-  for (unsigned int j = 1; j < this->Args.size(); ++j)
-    {
+  for (unsigned int j = 1; j < this->Args.size(); ++j) {
     variables.push_back("${" + this->Args[j] + "}");
-    }
+  }
   std::vector<std::string> argVs;
   argVs.reserve(expandedArgs.size());
   char argvName[60];
-  for (unsigned int j = 0; j < expandedArgs.size(); ++j)
-    {
-    sprintf(argvName,"${ARGV%i}",j);
+  for (unsigned int j = 0; j < expandedArgs.size(); ++j) {
+    sprintf(argvName, "${ARGV%i}", j);
     argVs.push_back(argvName);
-    }
+  }
   // Invoke all the functions that were collected in the block.
   cmListFileFunction newLFF;
   // for each function
-  for(unsigned int c = 0; c < this->Functions.size(); ++c)
-    {
+  for (unsigned int c = 0; c < this->Functions.size(); ++c) {
     // Replace the formal arguments and then invoke the command.
     newLFF.Arguments.clear();
     newLFF.Arguments.reserve(this->Functions[c].Arguments.size());
@@ -137,18 +129,15 @@ bool cmMacroHelperCommand::InvokeInitialPass
     // for each argument of the current function
     for (std::vector<cmListFileArgument>::iterator k =
            this->Functions[c].Arguments.begin();
-         k != this->Functions[c].Arguments.end(); ++k)
-      {
+         k != this->Functions[c].Arguments.end(); ++k) {
       cmListFileArgument arg;
       arg.Value = k->Value;
-      if(k->Delim != cmListFileArgument::Bracket)
-        {
+      if (k->Delim != cmListFileArgument::Bracket) {
         // replace formal arguments
-        for (unsigned int j = 0; j < variables.size(); ++j)
-          {
+        for (unsigned int j = 0; j < variables.size(); ++j) {
           cmSystemTools::ReplaceString(arg.Value, variables[j],
                                        expandedArgs[j]);
-          }
+        }
         // replace argc
         cmSystemTools::ReplaceString(arg.Value, "${ARGC}", argcDef);
 
@@ -157,61 +146,51 @@ bool cmMacroHelperCommand::InvokeInitialPass
 
         // if the current argument of the current function has ${ARGV in it
         // then try replacing ARGV values
-        if (arg.Value.find("${ARGV") != std::string::npos)
-          {
-          for (unsigned int t = 0; t < expandedArgs.size(); ++t)
-            {
-            cmSystemTools::ReplaceString(arg.Value, argVs[t],
-                                         expandedArgs[t]);
-            }
+        if (arg.Value.find("${ARGV") != std::string::npos) {
+          for (unsigned int t = 0; t < expandedArgs.size(); ++t) {
+            cmSystemTools::ReplaceString(arg.Value, argVs[t], expandedArgs[t]);
           }
         }
+      }
       arg.Delim = k->Delim;
       arg.Line = k->Line;
       newLFF.Arguments.push_back(arg);
-      }
+    }
     cmExecutionStatus status;
-    if(!this->Makefile->ExecuteCommand(newLFF, status) ||
-       status.GetNestedError())
-      {
+    if (!this->Makefile->ExecuteCommand(newLFF, status) ||
+        status.GetNestedError()) {
       // 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);
       return false;
-      }
-    if (status.GetReturnInvoked())
-      {
+    }
+    if (status.GetReturnInvoked()) {
       inStatus.SetReturnInvoked(true);
       return true;
-      }
-    if (status.GetBreakInvoked())
-      {
+    }
+    if (status.GetBreakInvoked()) {
       inStatus.SetBreakInvoked(true);
       return true;
-      }
     }
+  }
   return true;
 }
 
-bool cmMacroFunctionBlocker::
-IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
-                  cmExecutionStatus &)
+bool cmMacroFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
+                                               cmMakefile& mf,
+                                               cmExecutionStatus&)
 {
   // record commands until we hit the ENDMACRO
   // at the ENDMACRO call we shift gears and start looking for invocations
-  if(!cmSystemTools::Strucmp(lff.Name.c_str(),"macro"))
-    {
+  if (!cmSystemTools::Strucmp(lff.Name.c_str(), "macro")) {
     this->Depth++;
-    }
-  else if(!cmSystemTools::Strucmp(lff.Name.c_str(),"endmacro"))
-    {
+  } else if (!cmSystemTools::Strucmp(lff.Name.c_str(), "endmacro")) {
     // if this is the endmacro for this macro then execute
-    if (!this->Depth)
-      {
+    if (!this->Depth) {
       mf.AppendProperty("MACROS", this->Args[0].c_str());
       // create a new command and add it to cmake
-      cmMacroHelperCommand *f = new cmMacroHelperCommand();
+      cmMacroHelperCommand* f = new cmMacroHelperCommand();
       f->Args = this->Args;
       f->Functions = this->Functions;
       f->FilePath = this->GetStartingContext().FilePath;
@@ -223,13 +202,11 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
       // remove the function blocker now that the macro is defined
       mf.RemoveFunctionBlocker(this, lff);
       return true;
-      }
-    else
-      {
+    } else {
       // decrement for each nested macro that ends
       this->Depth--;
-      }
     }
+  }
 
   // if it wasn't an endmacro and we are not executing then we must be
   // recording
@@ -237,40 +214,35 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
   return true;
 }
 
-
-bool cmMacroFunctionBlocker::
-ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf)
+bool cmMacroFunctionBlocker::ShouldRemove(const cmListFileFunction& lff,
+                                          cmMakefile& mf)
 {
-  if(!cmSystemTools::Strucmp(lff.Name.c_str(),"endmacro"))
-    {
+  if (!cmSystemTools::Strucmp(lff.Name.c_str(), "endmacro")) {
     std::vector<std::string> expandedArguments;
     mf.ExpandArguments(lff.Arguments, expandedArguments,
                        this->GetStartingContext().FilePath.c_str());
     // if the endmacro has arguments make sure they
     // match the arguments of the macro
     if ((expandedArguments.empty() ||
-         (expandedArguments[0] == this->Args[0])))
-      {
+         (expandedArguments[0] == this->Args[0]))) {
       return true;
-      }
     }
+  }
 
   return false;
 }
 
 bool cmMacroCommand::InitialPass(std::vector<std::string> const& args,
-                                 cmExecutionStatus &)
+                                 cmExecutionStatus&)
 {
-  if(args.size() < 1)
-    {
+  if (args.size() < 1) {
     this->SetError("called with incorrect number of arguments");
     return false;
-    }
+  }
 
   // create a function blocker
-  cmMacroFunctionBlocker *f = new cmMacroFunctionBlocker();
+  cmMacroFunctionBlocker* f = new cmMacroFunctionBlocker();
   f->Args.insert(f->Args.end(), args.begin(), args.end());
   this->Makefile->AddFunctionBlocker(f);
   return true;
 }
-