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

Add the various parameter-passing keywords for Distributed Objects

Browse Source 
(such as in, inout, byref, and oneway) to code completion
results. Fixes <rdar://problem/8844158>.

llvm-svn: 136562
This commit is contained in:
Douglas Gregor
2011-07-30 07:55:26 +00:00
parent 6d40c57009
commit 8f08d74ee5
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1933,6 +1933,28 @@ static void MaybeAddSentinel(ASTContext &Context, NamedDecl *FunctionOrMethod,
}
}
static void appendWithSpace(std::string &Result, StringRef Text) {
if (!Result.empty())
Result += ' ';
Result += Text.str();
}
static std::string formatObjCParamQualifiers(unsigned ObjCQuals) {
std::string Result;
if (ObjCQuals & Decl::OBJC_TQ_In)
appendWithSpace(Result, "in");
else if (ObjCQuals & Decl::OBJC_TQ_Inout)
appendWithSpace(Result, "inout");
else if (ObjCQuals & Decl::OBJC_TQ_Out)
appendWithSpace(Result, "out");
if (ObjCQuals & Decl::OBJC_TQ_Bycopy)
appendWithSpace(Result, "bycopy");
else if (ObjCQuals & Decl::OBJC_TQ_Byref)
appendWithSpace(Result, "byref");
if (ObjCQuals & Decl::OBJC_TQ_Oneway)
appendWithSpace(Result, "oneway");
return Result;
}
static std::string FormatFunctionParameter(ASTContext &Context,
ParmVarDecl *Param,
bool SuppressName = false) {
@@ -1953,8 +1975,8 @@ static std::string FormatFunctionParameter(ASTContext &Context,
Param->getType().getAsStringInternal(Result, Policy);
if (ObjCMethodParam) {
Result = "(" + Result;
Result += ")";
Result = "(" + formatObjCParamQualifiers(Param->getObjCDeclQualifier())
+ Result + ")";
if (Param->getIdentifier() && !SuppressName)
Result += Param->getIdentifier()->getName();
}
@@ -2003,8 +2025,8 @@ static std::string FormatFunctionParameter(ASTContext &Context,
Param->getType().getUnqualifiedType().getAsStringInternal(Result, Policy);
if (ObjCMethodParam) {
Result = "(" + Result;
Result += ")";
Result = "(" + formatObjCParamQualifiers(Param->getObjCDeclQualifier())
+ Result + ")";
if (Param->getIdentifier())
Result += Param->getIdentifier()->getName();
}
@@ -2508,7 +2530,8 @@ CodeCompletionResult::CreateCodeCompletionString(Sema &S,
Arg = FormatFunctionParameter(S.Context, *P, true);
else {
(*P)->getType().getAsStringInternal(Arg, Policy);
Arg = "(" + Arg + ")";
Arg = "(" + formatObjCParamQualifiers((*P)->getObjCDeclQualifier())
+ Arg + ")";
if (IdentifierInfo *II = (*P)->getIdentifier())
if (DeclaringEntity || AllParametersAreInformative)
Arg += II->getName();