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

Allow name lookup into generic types.

Browse Source 
Swift SVN r2305
This commit is contained in:
Eli Friedman
2012-07-04 02:36:45 +00:00
parent a54c5493da
commit a65b737730
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/AST/NameLookup.cpp
View File

@@ -229,23 +229,28 @@ void MemberLookup::lookupMembers(Type BaseType, Module &M,
assert(Results.empty() &&
"This expects that the input list is empty, could be generalized");
TypeDecl *D;
NominalTypeDecl *D;
ArrayRef<ValueDecl*> BaseMembers;
SmallVector<ValueDecl*, 2> BaseMembersStorage;
if (NominalType *NT = BaseType->getAs<NominalType>()) {
if (BoundGenericType *BGT = BaseType->getAs<BoundGenericType>()) {
D = BGT->getDecl();
} else if (UnboundGenericType *UGT = BaseType->getAs<UnboundGenericType>()) {
D = UGT->getDecl();
} else if (NominalType *NT = BaseType->getAs<NominalType>()) {
D = NT->getDecl();
for (Decl* Member : NT->getDecl()->getMembers()) {
if (ValueDecl *VD = dyn_cast<ValueDecl>(Member))
BaseMembersStorage.push_back(VD);
}
if (NT->getDecl()->getGenericParams())
for (auto param : *NT->getDecl()->getGenericParams())
BaseMembersStorage.push_back(param.getDecl());
BaseMembers = BaseMembersStorage;
} else {
return;
}
for (Decl* Member : D->getMembers()) {
if (ValueDecl *VD = dyn_cast<ValueDecl>(Member))
BaseMembersStorage.push_back(VD);
}
if (D->getGenericParams())
for (auto param : *D->getGenericParams())
BaseMembersStorage.push_back(param.getDecl());
BaseMembers = BaseMembersStorage;
DeclContext *DC = D->getDeclContext();
while (!DC->isModuleContext())
DC = DC->getParent();