[NFC] Adopt new ImportPath types and terminology

# 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

View File

@@ -2111,22 +2111,21 @@ static int doInputCompletenessTest(StringRef SourceFilename) {
//===----------------------------------------------------------------------===//
static ModuleDecl *getModuleByFullName(ASTContext &Context, StringRef ModuleName) {
SmallVector<Located<Identifier>, 4>
AccessPath;
ImportPath::Module::Builder builder;
while (!ModuleName.empty()) {
StringRef SubModuleName;
std::tie(SubModuleName, ModuleName) = ModuleName.split('.');
AccessPath.push_back(
{ Context.getIdentifier(SubModuleName), SourceLoc() });
builder.push_back(Context.getIdentifier(SubModuleName));
}
ModuleDecl *Result = Context.getModule(AccessPath);
ModuleDecl *Result = Context.getModule(builder.get());
if (!Result || Result->failedToLoad())
return nullptr;
return Result;
}
static ModuleDecl *getModuleByFullName(ASTContext &Context, Identifier ModuleName) {
ModuleDecl *Result = Context.getModule({ Located<Identifier>(ModuleName,SourceLoc()) });
ModuleDecl *Result = Context.getModule(
ImportPath::Module::Builder(ModuleName).get());
if (!Result || Result->failedToLoad())
return nullptr;
return Result;