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

Teach code completion to cope with block types written without a

Browse Source 
prototype, e.g., ^() rather than ^(void). Fixes
<rdar://problem/8875712>.

llvm-svn: 125608
This commit is contained in:
Douglas Gregor
2011-02-15 22:37:09 +00:00
parent d62acb569c
commit 24bbc46208
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1894,7 +1894,8 @@ static std::string FormatFunctionParameter(ASTContext &Context,
// The argument for a block pointer parameter is a block literal with
// the appropriate type.
FunctionProtoTypeLoc *Block = 0;
FunctionTypeLoc *Block = 0;
FunctionProtoTypeLoc *BlockProto = 0;
TypeLoc TL;
if (TypeSourceInfo *TSInfo = Param->getTypeSourceInfo()) {
TL = TSInfo->getTypeLoc().getUnqualifiedLoc();
@@ -1919,7 +1920,8 @@ static std::string FormatFunctionParameter(ASTContext &Context,
if (BlockPointerTypeLoc *BlockPtr
= dyn_cast<BlockPointerTypeLoc>(&TL)) {
TL = BlockPtr->getPointeeLoc().IgnoreParens();
Block = dyn_cast<FunctionProtoTypeLoc>(&TL);
Block = dyn_cast<FunctionTypeLoc>(&TL);
BlockProto = dyn_cast<FunctionProtoTypeLoc>(&TL);
}
break;
}
@@ -1950,8 +1952,8 @@ static std::string FormatFunctionParameter(ASTContext &Context,
ResultType.getAsStringInternal(Result, Context.PrintingPolicy);
Result = '^' + Result;
if (Block->getNumArgs() == 0) {
if (Block->getTypePtr()->isVariadic())
if (!BlockProto || Block->getNumArgs() == 0) {
if (BlockProto && BlockProto->getTypePtr()->isVariadic())
Result += "(...)";
else
Result += "(void)";
@@ -1962,7 +1964,7 @@ static std::string FormatFunctionParameter(ASTContext &Context,
Result += ", ";
Result += FormatFunctionParameter(Context, Block->getArg(I));
if (I == N - 1 && Block->getTypePtr()->isVariadic())
if (I == N - 1 && BlockProto->getTypePtr()->isVariadic())
Result += ", ...";
}
Result += ")";