kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmMacroCommand: Declare arg variables where used and initialized. 

Make the initialization by population with the expanded* content
unconditional.
This commit is contained in:
Stephen Kelly 2015-02-11 19:10:19 +01:00
parent 17b5ebd383
commit 081a13f7c0
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/cmMacroCommand.cxx
View File

@ -111,15 +111,10 @@ bool cmMacroHelperCommand::InvokeInitialPass
argcDefStream << expandedArgs.size(); argcDefStream << expandedArgs.size();
std::string argcDef = argcDefStream.str(); std::string argcDef = argcDefStream.str();
// declare varuiables for ARGV ARGN but do not compute until needed
std::string argvDef;
std::string argnDef;
std::vector<std::string>::const_iterator eit std::vector<std::string>::const_iterator eit
= expandedArgs.begin() + (this->Args.size() - 1); = expandedArgs.begin() + (this->Args.size() - 1);
std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";"); std::string expandedArgn = cmJoin(cmRange(eit, expandedArgs.end()), ";");
std::string expandedArgv = cmJoin(expandedArgs, ";"); std::string expandedArgv = cmJoin(expandedArgs, ";");
bool argnDefInitialized = false;
bool argvDefInitialized = false;
if(!this->Functions.empty()) if(!this->Functions.empty())
{ {
this->FilePath = this->Functions[0].FilePath; this->FilePath = this->Functions[0].FilePath;
@ -166,17 +161,14 @@ bool cmMacroHelperCommand::InvokeInitialPass
// repleace ARGN // repleace ARGN
if (tmps.find("${ARGN}") != std::string::npos) if (tmps.find("${ARGN}") != std::string::npos)
{ {
if (!argnDefInitialized) std::string argnDef;
if (expandedArgs.size() > this->Args.size() - 1)
{ {
if (expandedArgs.size() > this->Args.size() - 1) if (!argnDef.empty() && !expandedArgs.empty())
{ {
if (!argnDef.empty() && !expandedArgs.empty()) argnDef += ";";
{
argnDef += ";";
}
argnDef += expandedArgn;
} }
argnDefInitialized = true; argnDef += expandedArgn;
} }
cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str()); cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
} }
@ -187,16 +179,12 @@ bool cmMacroHelperCommand::InvokeInitialPass
{ {
char argvName[60]; char argvName[60];
// repleace ARGV, compute it only once std::string argvDef;
if (!argvDefInitialized) if (!argvDef.empty() && !expandedArgs.empty())
{ {
if (!argvDef.empty() && !expandedArgs.empty()) argvDef += ";";
{
argvDef += ";";
}
argvDef += expandedArgv;
argvDefInitialized = true;
} }
argvDef += expandedArgv;
cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str()); cmSystemTools::ReplaceString(tmps, "${ARGV}", argvDef.c_str());
// also replace the ARGV1 ARGV2 ... etc // also replace the ARGV1 ARGV2 ... etc