nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the code completion string for variadic macros with more than one

Browse Source 
argument, which was broken and very ugly (and even had a test case to
make *sure* it was broken and ugly). Fixes <rdar://problem/10609117>.

llvm-svn: 148606
This commit is contained in:
Douglas Gregor
2012-01-21 00:43:38 +00:00
parent 5c0f483ec1
commit 3aa55267c4
2 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
clang/lib/Sema/SemaCodeComplete.cpp
View File

@@ -2455,45 +2455,34 @@ CodeCompletionResult::CreateCodeCompletionString(ASTContext &Ctx,
// Format a function-like macro with placeholders for the arguments.
Result.AddChunk(Chunk(CodeCompletionString::CK_LeftParen));
bool CombineVariadicArgument = false;
MacroInfo::arg_iterator A = MI->arg_begin(), AEnd = MI->arg_end();
if (MI->isVariadic() && AEnd - A > 1) {
AEnd -= 2;
CombineVariadicArgument = true;
// C99 variadic macros add __VA_ARGS__ at the end. Skip it.
if (MI->isC99Varargs()) {
--AEnd;
if (A == AEnd) {
Result.AddPlaceholderChunk("...");
}
}
for (MacroInfo::arg_iterator A = MI->arg_begin(); A != AEnd; ++A) {
if (A != MI->arg_begin())
Result.AddChunk(Chunk(CodeCompletionString::CK_Comma));
if (!MI->isVariadic() || A + 1 != AEnd) {
// Non-variadic argument.
Result.AddPlaceholderChunk(
Result.getAllocator().CopyString((*A)->getName()));
continue;
}
// Variadic argument; cope with the difference between GNU and C99
// variadic macros, providing a single placeholder for the rest of the
// arguments.
if ((*A)->isStr("__VA_ARGS__"))
Result.AddPlaceholderChunk("...");
else {
std::string Arg = (*A)->getName();
Arg += "...";
if (MI->isVariadic() && (A+1) == AEnd) {
llvm::SmallString<32> Arg = (*A)->getName();
if (MI->isC99Varargs())
Arg += ", ...";
else
Arg += "...";
Result.AddPlaceholderChunk(Result.getAllocator().CopyString(Arg));
break;
}
}
if (CombineVariadicArgument) {
// Handle the next-to-last argument, combining it with the variadic
// argument.
std::string LastArg = (*A)->getName();
++A;
if ((*A)->isStr("__VA_ARGS__"))
LastArg += ", ...";
else
LastArg += ", " + (*A)->getName().str() + "...";
Result.AddPlaceholderChunk(Result.getAllocator().CopyString(LastArg));
// Non-variadic macros are simple.
Result.AddPlaceholderChunk(
Result.getAllocator().CopyString((*A)->getName()));
}
Result.AddChunk(Chunk(CodeCompletionString::CK_RightParen));
return Result.TakeString();