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

Merge topic 'cmake-syntax-recorded-brackets' 

b54dbeb Test foreach/function/macro handling of bracket arguments
ccdf7e0 macro: Do not substitute for placeholders in bracket arguments
999abb9 macro: Add extra indentation to placeholder substitution code
This commit is contained in:
Brad King 2013-11-01 09:39:56 -04:00 committed by CMake Topic Stage
parent 80c3420f30 b54dbebf62
commit a549b68d37
8 changed files with 80 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
Source/cmMacroCommand.cxx
View File

@ -140,75 +140,82 @@ bool cmMacroHelperCommand::InvokeInitialPass
// Set the FilePath on the arguments to match the function since it is // Set the FilePath on the arguments to match the function since it is
// not stored and the original values may be freed // not stored and the original values may be freed
k->FilePath = this->FilePath.c_str(); k->FilePath = this->FilePath.c_str();
tmps = k->Value; if(k->Delim == cmListFileArgument::Bracket)
// replace formal arguments
for (unsigned int j = 1; j < this->Args.size(); ++j)
{ {
variable = "${"; arg.Value = k->Value;
variable += this->Args[j];
variable += "}";
cmSystemTools::ReplaceString(tmps, variable.c_str(),
expandedArgs[j-1].c_str());
} }
// replace argc else
cmSystemTools::ReplaceString(tmps, "${ARGC}",argcDef.c_str());
// repleace ARGN
if (tmps.find("${ARGN}") != std::string::npos)
{ {
if (!argnDefInitialized) tmps = k->Value;
// replace formal arguments
for (unsigned int j = 1; j < this->Args.size(); ++j)
{ {
std::vector<std::string>::const_iterator eit; variable = "${";
std::vector<std::string>::size_type cnt = 0; variable += this->Args[j];
for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit ) 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)
{ {
if ( cnt >= this->Args.size()-1 ) std::vector<std::string>::const_iterator eit;
std::vector<std::string>::size_type cnt = 0;
for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
{ {
if ( argnDef.size() > 0 ) if ( cnt >= this->Args.size()-1 )
{ {
argnDef += ";"; if ( argnDef.size() > 0 )
{
argnDef += ";";
}
argnDef += *eit;
} }
argnDef += *eit; cnt ++;
} }
cnt ++; argnDefInitialized = true;
} }
argnDefInitialized = true; cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
} }
cmSystemTools::ReplaceString(tmps, "${ARGN}", argnDef.c_str());
}
// if the current argument of the current function has ${ARGV in it // if the current argument of the current function has ${ARGV in it
// then try replacing ARGV values // then try replacing ARGV values
if (tmps.find("${ARGV") != std::string::npos) 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; char argvName[60];
for ( eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit )
// repleace ARGV, compute it only once
if (!argvDefInitialized)
{ {
if ( argvDef.size() > 0 ) std::vector<std::string>::const_iterator eit;
for(eit = expandedArgs.begin(); eit != expandedArgs.end(); ++eit)
{ {
argvDef += ";"; if ( argvDef.size() > 0 )
{
argvDef += ";";
}
argvDef += *eit;
} }
argvDef += *eit; argvDefInitialized = true;
} }
argvDefInitialized = true; 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
for (unsigned int t = 0; t < expandedArgs.size(); ++t) for (unsigned int t = 0; t < expandedArgs.size(); ++t)
{ {
sprintf(argvName,"${ARGV%i}",t); sprintf(argvName,"${ARGV%i}",t);
cmSystemTools::ReplaceString(tmps, argvName, cmSystemTools::ReplaceString(tmps, argvName,
expandedArgs[t].c_str()); expandedArgs[t].c_str());
}
} }
arg.Value = tmps;
} }
arg.Value = tmps;
arg.Delim = k->Delim; arg.Delim = k->Delim;
arg.FilePath = k->FilePath; arg.FilePath = k->FilePath;
arg.Line = k->Line; arg.Line = k->Line;

2
Tests/RunCMake/Syntax/ForEachBracket1-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^\${x}:a
\${x}:b$

3
Tests/RunCMake/Syntax/ForEachBracket1.cmake Normal file
View File

@ -0,0 +1,3 @@
foreach(x a b)
message([[${x}:]] "${x}")
endforeach()

2
Tests/RunCMake/Syntax/FunctionBracket1-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^\${x},\${ARGN},\${ARGC},\${ARGV},\${ARGV0},\${ARGV1},\${ARGV2}:a,n,2,a;n,a,n,
\${x},\${ARGN},\${ARGC},\${ARGV},\${ARGV0},\${ARGV1},\${ARGV2}:b,n,2,b;n,b,n,$

6
Tests/RunCMake/Syntax/FunctionBracket1.cmake Normal file
View File

@ -0,0 +1,6 @@
function(fun x)
message([[${x},${ARGN},${ARGC},${ARGV},${ARGV0},${ARGV1},${ARGV2}:]]
"${x},${ARGN},${ARGC},${ARGV},${ARGV0},${ARGV1},${ARGV2}")
endfunction(fun)
fun(a n)
fun(b n)

2
Tests/RunCMake/Syntax/MacroBracket1-stderr.txt Normal file
View File

@ -0,0 +1,2 @@
^\${x},\${ARGN},\${ARGC},\${ARGV},\${ARGV0},\${ARGV1},\${ARGV2}:a,n,2,a;n,a,n,
\${x},\${ARGN},\${ARGC},\${ARGV},\${ARGV0},\${ARGV1},\${ARGV2}:b,n,2,b;n,b,n,$

6
Tests/RunCMake/Syntax/MacroBracket1.cmake Normal file
View File

@ -0,0 +1,6 @@
macro(mac x)
message([[${x},${ARGN},${ARGC},${ARGV},${ARGV0},${ARGV1},${ARGV2}:]]
"${x},${ARGN},${ARGC},${ARGV},${ARGV0},${ARGV1},${ARGV2}")
endmacro(mac)
mac(a n)
mac(b n)

3
Tests/RunCMake/Syntax/RunCMakeTest.cmake
View File

@ -12,6 +12,9 @@ run_cmake(CommandComments)
run_cmake(CommandError0) run_cmake(CommandError0)
run_cmake(CommandError1) run_cmake(CommandError1)
run_cmake(CommandError2) run_cmake(CommandError2)
run_cmake(ForEachBracket1)
run_cmake(FunctionBracket1)
run_cmake(MacroBracket1)
run_cmake(String0) run_cmake(String0)
run_cmake(String1) run_cmake(String1)
run_cmake(StringBackslash) run_cmake(StringBackslash)