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

Introduce a LoadedModule base class for ClangModule and SerializedModule.

Browse Source 
This keeps AST insulated from the various module-loading interfaces, which
minimizes special-casing of the differences between ClangModule and the
(upcoming) SerializedModule.

Swift SVN r5096
This commit is contained in:
Jordan Rose
2013-05-08 18:33:36 +00:00
parent 77ce3f31cb
commit 7bea410369
3 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/AST/Module.cpp
View File

@@ -234,8 +234,7 @@ ArrayRef<ExtensionDecl*> Module::lookupExtensions(Type T) {
return Cache.getExtensions(T->getCanonicalType());
}
assert(isa<ClangModule>(this));
return Ctx.getClangModuleLoader()->lookupExtensions(this, T);
return cast<LoadedModule>(this)->lookupExtensions(T);
}
//===----------------------------------------------------------------------===//
@@ -261,9 +260,8 @@ void Module::lookupValue(AccessPathTy AccessPath, Identifier Name,
.lookupValue(AccessPath, Name, LookupKind, *TU, Result);
}
assert(isa<ClangModule>(this));
return Ctx.getClangModuleLoader()->lookupValue(this, AccessPath,
Name, LookupKind, Result);
return cast<LoadedModule>(this)->lookupValue(AccessPath, Name, LookupKind,
Result);
}
/// lookupVisibleDecls - Find ValueDecls in the module and pass them to the
@@ -395,14 +393,29 @@ void TranslationUnit::clearLookupCache() {
freeTUExtensionCachePimpl(ExtensionCachePimpl);
}
//===----------------------------------------------------------------------===//
// LoadedModule Implementation
//===----------------------------------------------------------------------===//
void LoadedModule::lookupValue(AccessPathTy accessPath, Identifier name,
NLKind lookupKind,
SmallVectorImpl<ValueDecl*> &result) {
return Owner.lookupValue(this, accessPath, name, lookupKind, result);
}
ArrayRef<ExtensionDecl*> LoadedModule::lookupExtensions(Type T) {
return Owner.lookupExtensions(this, T);
}
//===----------------------------------------------------------------------===//
// ClangModule Implementation
//===----------------------------------------------------------------------===//
ClangModule::ClangModule(ASTContext &ctx, Component *comp,
ClangModule::ClangModule(ASTContext &ctx, ModuleLoader &owner, Component *comp,
clang::Module *clangModule)
: Module(DeclContextKind::ClangModule,
ctx.getIdentifier(clangModule->getFullModuleName()),
comp, ctx),
: LoadedModule(DeclContextKind::ClangModule,
ctx.getIdentifier(clangModule->Name),
comp, ctx, owner),
clangModule(clangModule)
{
// Clang modules are always well-formed.