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

11
tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp
View File

@@ -335,20 +335,17 @@ int main(int argc, char **argv) {
if (Verbose)
llvm::outs() << "Importing " << path << "... ";
swift::ImportPath::Module::Builder modulePath;
#ifdef SWIFT_SUPPORTS_SUBMODULES
std::vector<swift::Located<swift::Identifier>> AccessPath;
for (auto i = llvm::sys::path::begin(path);
i != llvm::sys::path::end(path); ++i)
if (!llvm::sys::path::is_separator((*i)[0]))
AccessPath.push_back({ CI.getASTContext().getIdentifier(*i),
swift::SourceLoc() });
modulePath.push_back(CI.getASTContext().getIdentifier(*i));
#else
std::vector<swift::Located<swift::Identifier>> AccessPath;
AccessPath.push_back({ CI.getASTContext().getIdentifier(path),
swift::SourceLoc() });
modulePath.push_back(CI.getASTContext().getIdentifier(path));
#endif
auto Module = CI.getASTContext().getModule(AccessPath);
auto Module = CI.getASTContext().getModule(modulePath.get());
if (!Module) {
if (Verbose)
llvm::errs() << "FAIL!\n";