averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sema: Replace some uses of getBaseIdentifier() with userFacingName()

Browse Source
This commit is contained in:
Slava Pestov
2018-03-14 01:20:00 -07:00
parent 1f7ac24e9b
commit 615d068d63
12 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/AST/SwiftNameTranslation.cpp
View File

@@ -73,11 +73,16 @@ printSwiftEnumElemNameInObjC(const EnumElementDecl *EL, llvm::raw_ostream &OS,
std::pair<Identifier, ObjCSelector> swift::objc_translation::
getObjCNameForSwiftDecl(const ValueDecl *VD, DeclName PreferredName){
ASTContext &Ctx = VD->getASTContext();
Identifier BaseName;
if (PreferredName) {
auto BaseNameStr = PreferredName.getBaseName().userFacingName();
BaseName = Ctx.getIdentifier(BaseNameStr);
}
if (auto *FD = dyn_cast<AbstractFunctionDecl>(VD)) {
return {Identifier(), FD->getObjCSelector(PreferredName)};
} else if (auto *VAD = dyn_cast<VarDecl>(VD)) {
if (PreferredName)
return {PreferredName.getBaseIdentifier(), ObjCSelector()};
return {BaseName, ObjCSelector()};
return {VAD->getObjCPropertyName(), ObjCSelector()};
} else if (auto *SD = dyn_cast<SubscriptDecl>(VD)) {
return getObjCNameForSwiftDecl(SD->getGetter(), PreferredName);
@@ -85,7 +90,7 @@ getObjCNameForSwiftDecl(const ValueDecl *VD, DeclName PreferredName){
SmallString<64> Buffer;
{
llvm::raw_svector_ostream OS(Buffer);
printSwiftEnumElemNameInObjC(EL, OS, PreferredName.getBaseIdentifier());
printSwiftEnumElemNameInObjC(EL, OS, BaseName);
}
return {Ctx.getIdentifier(Buffer.str()), ObjCSelector()};
} else {
@@ -93,8 +98,8 @@ getObjCNameForSwiftDecl(const ValueDecl *VD, DeclName PreferredName){
StringRef Name = getNameForObjC(VD, CustomNamesOnly);
if (!Name.empty())
return {Ctx.getIdentifier(Name), ObjCSelector()};
if (!PreferredName.getBaseName().empty())
return {PreferredName.getBaseIdentifier(), ObjCSelector()};
if (PreferredName)
return {BaseName, ObjCSelector()};
return {Ctx.getIdentifier(getNameForObjC(VD)), ObjCSelector()};
}
}