ENH: revert back to string replacement version

Source/cmMacroCommand.cxx

@@ -112,20 +112,53 @@ bool cmMacroHelperCommand::InvokeInitialPass
   // declare varuiables for ARGV ARGN but do not compute until needed
   std::string argvDef;
   std::string argnDef;
+  bool argnDefInitialized = false;
+  bool argvDefInitialized = false;
   
-  // save the current definitions of all vars that we will be setting
+  // Invoke all the functions that were collected in the block.
-  std::string oldARGC;
+  cmListFileFunction newLFF;
-  if (m_Makefile->GetDefinition("ARGC"))
+  // for each function
+  for(unsigned int c = 0; c < m_Functions.size(); ++c)
     {
-    oldARGC = m_Makefile->GetDefinition("ARGC");
+    // Replace the formal arguments and then invoke the command.
+    newLFF.m_Arguments.clear();
+    newLFF.m_Arguments.reserve(m_Functions[c].m_Arguments.size());
+    newLFF.m_Name = m_Functions[c].m_Name;
+    newLFF.m_FilePath = m_Functions[c].m_FilePath;
+    newLFF.m_Line = m_Functions[c].m_Line;
+    const char* def =
+      m_Makefile->GetDefinition("CMAKE_MACRO_REPORT_DEFINITION_LOCATION"); 
+    bool macroReportLocation = false;
+    if(def && !cmSystemTools::IsOff(def))
+      {
+      macroReportLocation = true;
       }
-  m_Makefile->AddDefinition("ARGC",argcDef.c_str());
     
-  // store ARGN, ARGV
+    // for each argument of the current function
-  std::vector<std::string> oldARGVArgs;
+    for (std::vector<cmListFileArgument>::const_iterator k = 
+           m_Functions[c].m_Arguments.begin();
+         k != m_Functions[c].m_Arguments.end(); ++k)
+      {
+      tmps = k->Value;
+      // replace formal arguments
+      for (unsigned int j = 1; j < m_Args.size(); ++j)
+        {
+        variable = "${";
+        variable += m_Args[j];
+        variable += "}"; 
+        cmSystemTools::ReplaceString(tmps, variable.c_str(),
+                                     expandedArgs[j-1].c_str());
+        }
+      // replace argc
+      cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
+      
+      // repleace ARGN
+      if (tmps.find("${ARGN}") != std::string::npos)
+        {
+        if (!argnDefInitialized)
+          {
           std::vector<std::string>::const_iterator eit;
           std::vector<std::string>::size_type cnt = 0;
-  char argvName[60];
           for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit )
             {
             if ( cnt >= m_Args.size()-1 )
@@ -136,79 +169,81 @@ bool cmMacroHelperCommand::InvokeInitialPass
                 }
               argnDef += *eit;
               }
+            cnt ++;
+            }
+          argnDefInitialized = true;
+          }
+        cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
+        }
+      
+      // if the current argument of the current function has ${ARGV in it
+      // then try replacing ARGV values
+      if (tmps.find("${ARGV") != std::string::npos)
+        {
+        char argvName[60];
+        
+        // repleace ARGV, compute it only once
+        if (!argvDefInitialized)
+          {
+          std::vector<std::string>::const_iterator eit;
+          for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit )
+            {
             if ( argvDef.size() > 0 )
               {
               argvDef += ";";
               }
             argvDef += *eit;
-    oldARGVArgs.push_back(std::string());
-    sprintf(argvName,"ARGV%i",static_cast<int>(cnt));
-    if (m_Makefile->GetDefinition(argvName))
-      {
-      oldARGVArgs[cnt] = m_Makefile->GetDefinition(argvName);
             }
-    m_Makefile->AddDefinition(argvName,eit->c_str());
+          argvDefInitialized = true;
-    cnt++;
           }
-  std::string oldARGN;
+        cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
-  if (m_Makefile->GetDefinition("ARGN"))
-    {
-    oldARGN = m_Makefile->GetDefinition("ARGN");
-    }
-  m_Makefile->AddDefinition("ARGN",argnDef.c_str());
-  std::string oldARGV;
-  if (m_Makefile->GetDefinition("ARGV"))
-    {
-    oldARGV = m_Makefile->GetDefinition("ARGV");
-    }
-  m_Makefile->AddDefinition("ARGV",argvDef.c_str());
         
-  // store old defs for formal args
+        // also replace the ARGV1 ARGV2 ... etc
-  std::vector<std::string> oldFormalArgs;
+        for (unsigned int t = 0; t < expandedArgs.size(); ++t)
-  for (unsigned int j = 1; j < m_Args.size(); ++j)
           {
-    oldFormalArgs.push_back(std::string());
+          sprintf(argvName,"${ARGV%i}",t);
-    if (m_Makefile->GetDefinition(m_Args[j].c_str()))
+          cmSystemTools::ReplaceString(tmps, argvName,
-      {
+                                       expandedArgs[t].c_str());
-      oldFormalArgs[j-1] = m_Makefile->GetDefinition(m_Args[j].c_str());
           }
-    m_Makefile->AddDefinition(m_Args[j].c_str(),expandedArgs[j-1].c_str());
         }
       
-  // Invoke all the functions that were collected in the block.
+      arg.Value = tmps;
-  for(unsigned int c = 0; c < m_Functions.size(); ++c)
+      arg.Quoted = k->Quoted;
+      if(macroReportLocation)
         {
-    if(!m_Makefile->ExecuteCommand(m_Functions[c]))
+        // Report the location of the argument where the macro was
+        // defined.
+        arg.FilePath = k->FilePath;
+        arg.Line = k->Line;
+        }
+      else
+        {
+        // Report the location of the argument where the macro was
+        // invoked.
+        if (args.size())
+          {
+          arg.FilePath = args[0].FilePath;
+          arg.Line = args[0].Line;
+          }
+        else
+          {
+          arg.FilePath = "Unknown";
+          arg.Line = 0;
+          }
+        }
+      newLFF.m_Arguments.push_back(arg);
+      }
+    if(!m_Makefile->ExecuteCommand(newLFF))
       {
       cmOStringStream error;
       error << "Error in cmake code at\n"
-            << args[0].FilePath << ":" << args[0].Line << "\n"
+            << args[0].FilePath << ":" << args[0].Line << ":\n"
             << "A command failed during the invocation of macro \""
-            << this->m_Args[0].c_str() << "\".\nThe failing line "
+            << this->m_Args[0].c_str() << "\".";
-            << "in the macro definition was at\n" 
-            << m_Functions[c].m_FilePath << ":"
-            << m_Functions[c].m_Line << "\n";
       cmSystemTools::Error(error.str().c_str());
       return false;
       }
     }
-  
-  // restore all args
-  m_Makefile->AddDefinition("ARGC",oldARGC.c_str());
-  m_Makefile->AddDefinition("ARGN",oldARGN.c_str());
-  m_Makefile->AddDefinition("ARGV",oldARGV.c_str());
-  // restore old defs for formal args
-  for (unsigned int j = 1; j < m_Args.size(); ++j)
-    {
-    m_Makefile->AddDefinition(m_Args[j].c_str(),oldFormalArgs[j-1].c_str());
-    }
-  // restore old defs for formal args
-  for (unsigned int j = 0; j < oldARGVArgs.size(); ++j)
-    {
-    sprintf(argvName,"ARGV%i",j);
-    m_Makefile->AddDefinition(argvName,oldARGVArgs[j].c_str());
-    }
-  
   return true;
 }