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

Remove LoadedModule, and strip ModuleLoader down to just loading things.

Browse Source 
Now that everything is done in terms of FileUnits, we don't need LoadedModule
anymore, and now that FileUnits just use virtual dispatch, we don't need to
indirect through ModuleLoader to distinguish them.

This doesn't quite simplify as much as it could, because the next change is
going to combine TranslationUnit and Module.

Swift SVN r10836
This commit is contained in:
Jordan Rose
2013-12-05 01:51:12 +00:00
parent f5eae17dd2
commit 5dda63aa82
7 changed files with 16 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/AST/Module.cpp
View File

@@ -268,8 +268,8 @@ void SourceLookupCache::lookupClassMember(AccessPathTy accessPath,
// Module Implementation
//===----------------------------------------------------------------------===//
// FIXME: Remove this indirection.
template <typename FUMemFn, FUMemFn FULOOKUP,
typename MLMemFn, MLMemFn MLLOOKUP,
typename ...Args>
void Module::forwardToSourceFiles(Args &&...args) const {
if (auto TU = dyn_cast<TranslationUnit>(this)) {
@@ -277,15 +277,10 @@ void Module::forwardToSourceFiles(Args &&...args) const {
(file->*FULOOKUP)(args...);
return;
}
// FIXME: Remove this.
ModuleLoader &owner = cast<LoadedModule>(this)->getOwner();
(owner.*MLLOOKUP)(this, args...);
}
#define FORWARD(name, args) \
forwardToSourceFiles<decltype(&FileUnit::name), &FileUnit::name, \
decltype(&ModuleLoader::name), &ModuleLoader::name>args
forwardToSourceFiles<decltype(&FileUnit::name), &FileUnit::name>args
void Module::lookupValue(AccessPathTy AccessPath, Identifier Name,
NLKind LookupKind,
@@ -802,9 +797,6 @@ void Module::getDisplayDecls(SmallVectorImpl<Decl*> &results) const {
getTopLevelDecls(results);
return;
}
ModuleLoader &owner = cast<LoadedModule>(this)->getOwner();
return owner.getDisplayDecls(this, results);
}
namespace {
@@ -928,9 +920,6 @@ static Optional<OP_DECL *>
lookupOperatorDeclForName(Module *M, SourceLoc Loc, Identifier Name,
OperatorMap<OP_DECL *> SourceFile::*OP_MAP)
{
if (auto loadedModule = dyn_cast<LoadedModule>(M))
return lookupOperator<OP_DECL>(*loadedModule, Name);
auto *TU = cast<TranslationUnit>(M);
OP_DECL *result = nullptr;
@@ -1029,8 +1018,7 @@ StringRef Module::getModuleFilename() const {
return StringRef();
}
ModuleLoader &Owner = cast<LoadedModule>(this)->getOwner();
return Owner.getModuleFilename(this);
return StringRef();
}
bool Module::isStdlibModule() const {
@@ -1220,15 +1208,6 @@ StringRef SourceFile::getFilename() const {
}
//===----------------------------------------------------------------------===//
// LoadedModule Implementation
//===----------------------------------------------------------------------===//
OperatorDecl *LoadedModule::lookupOperator(Identifier name, DeclKind fixity) {
return getOwner().lookupOperator(this, name, fixity);
}
//===----------------------------------------------------------------------===//
// Miscellaneous
//===----------------------------------------------------------------------===//