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

[NFC] Adopt new ImportPath types and terminology

Browse Source 
# Conflicts:
#	lib/IDE/CodeCompletion.cpp
This commit is contained in:
Brent Royal-Gordon
2020-09-10 19:05:40 -07:00
parent 1ed3caece6
commit cff4ddf13a
52 changed files with 375 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -251,7 +251,7 @@ void ImplicitSerializedModuleLoader::collectVisibleTopLevelModuleNames(
}
std::error_code SerializedModuleLoaderBase::openModuleDocFileIfPresent(
AccessPathElem ModuleID,
ImportPath::Element ModuleID,
const SerializedModuleBaseName &BaseName,
std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer) {
@@ -285,7 +285,7 @@ SerializedModuleLoaderBase::getModuleName(ASTContext &Ctx, StringRef modulePath,
std::error_code
SerializedModuleLoaderBase::openModuleSourceInfoFileIfPresent(
AccessPathElem ModuleID,
ImportPath::Element ModuleID,
const SerializedModuleBaseName &BaseName,
std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer) {
if (IgnoreSwiftSourceInfoFile || !ModuleSourceInfoBuffer)
@@ -324,7 +324,7 @@ SerializedModuleLoaderBase::openModuleSourceInfoFileIfPresent(
}
std::error_code SerializedModuleLoaderBase::openModuleFile(
AccessPathElem ModuleID, const SerializedModuleBaseName &BaseName,
ImportPath::Element ModuleID, const SerializedModuleBaseName &BaseName,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer) {
llvm::vfs::FileSystem &FS = *Ctx.SourceMgr.getFileSystem();
@@ -416,7 +416,7 @@ llvm::ErrorOr<ModuleDependencies> SerializedModuleLoaderBase::scanModuleFile(
}
std::error_code ImplicitSerializedModuleLoader::findModuleFilesInDirectory(
AccessPathElem ModuleID,
ImportPath::Element ModuleID,
const SerializedModuleBaseName &BaseName,
SmallVectorImpl<char> *ModuleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
@@ -510,7 +510,7 @@ std::string SerializedModuleBaseName::getName(file_types::ID fileTy) const {
}
bool
SerializedModuleLoaderBase::findModule(AccessPathElem moduleID,
SerializedModuleLoaderBase::findModule(ImportPath::Element moduleID,
SmallVectorImpl<char> *moduleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *moduleBuffer,
std::unique_ptr<llvm::MemoryBuffer> *moduleDocBuffer,
@@ -930,7 +930,7 @@ void swift::serialization::diagnoseSerializedASTLoadFailure(
}
bool SerializedModuleLoaderBase::canImportModule(
Located<Identifier> mID) {
ImportPath::Element mID) {
// Look on disk.
SmallVector<char, 0> *unusedModuleInterfacePath = nullptr;
std::unique_ptr<llvm::MemoryBuffer> *unusedModuleBuffer = nullptr;
@@ -944,14 +944,14 @@ bool SerializedModuleLoaderBase::canImportModule(
}
bool MemoryBufferSerializedModuleLoader::canImportModule(
Located<Identifier> mID) {
ImportPath::Element mID) {
// See if we find it in the registered memory buffers.
return MemoryBuffers.count(mID.Item.str());
}
ModuleDecl *
SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
ModuleDecl::AccessPathTy path) {
ImportPath::Module path) {
// FIXME: Swift submodules?
if (path.size() > 1)
return nullptr;
@@ -1000,7 +1000,7 @@ SerializedModuleLoaderBase::loadModule(SourceLoc importLoc,
ModuleDecl *
MemoryBufferSerializedModuleLoader::loadModule(SourceLoc importLoc,
ModuleDecl::AccessPathTy path) {
ImportPath::Module path) {
// FIXME: Swift submodules?
if (path.size() > 1)
return nullptr;
@@ -1070,7 +1070,7 @@ void SerializedModuleLoaderBase::loadDerivativeFunctionConfigurations(
}
std::error_code MemoryBufferSerializedModuleLoader::findModuleFilesInDirectory(
AccessPathElem ModuleID,
ImportPath::Element ModuleID,
const SerializedModuleBaseName &BaseName,
SmallVectorImpl<char> *ModuleInterfacePath,
std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
@@ -1179,19 +1179,19 @@ void SerializedASTFile::lookupPrecedenceGroupDirect(
results.push_back(group);
}
void SerializedASTFile::lookupVisibleDecls(ModuleDecl::AccessPathTy accessPath,
void SerializedASTFile::lookupVisibleDecls(ImportPath::Access accessPath,
VisibleDeclConsumer &consumer,
NLKind lookupKind) const {
File.lookupVisibleDecls(accessPath, consumer, lookupKind);
}
void SerializedASTFile::lookupClassMembers(ModuleDecl::AccessPathTy accessPath,
void SerializedASTFile::lookupClassMembers(ImportPath::Access accessPath,
VisibleDeclConsumer &consumer) const{
File.lookupClassMembers(accessPath, consumer);
}
void
SerializedASTFile::lookupClassMember(ModuleDecl::AccessPathTy accessPath,
SerializedASTFile::lookupClassMember(ImportPath::Access accessPath,
DeclName name,
SmallVectorImpl<ValueDecl*> &decls) const {
File.lookupClassMember(accessPath, name, decls);