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

Incremental getterization of Decl.h.

Browse Source 
Swift SVN r882
This commit is contained in:
John McCall
2011-11-18 00:17:20 +00:00
parent de3c3ff04d
commit d74f17259c
12 changed files with 109 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Sema/NameBinding.cpp
View File

@@ -145,17 +145,18 @@ Module *NameBinder::getModule(std::pair<Identifier, SourceLoc> ModuleID) {
void NameBinder::addImport(ImportDecl *ID,
SmallVectorImpl<ImportedModule> &Result) {
Module *M = getModule(ID->AccessPath[0]);
ArrayRef<ImportDecl::AccessPathElement> Path = ID->getAccessPath();
Module *M = getModule(Path[0]);
if (M == 0) return;
// FIXME: Validate the access path against the module. Reject things like
// import swift.aslkdfja
if (ID->AccessPath.size() > 2) {
diagnose(ID->AccessPath[2].second, diag::invalid_declaration_imported);
if (Path.size() > 2) {
diagnose(Path[2].second, diag::invalid_declaration_imported);
return;
}
Result.push_back(std::make_pair(ID->AccessPath.slice(1), M));
Result.push_back(std::make_pair(Path.slice(1), M));
}
/// Try to bind an unqualified name into something usable as a scope.