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] Add helper to parse import paths in strings

Browse Source
This commit is contained in:
Brent Royal-Gordon
2020-08-31 12:47:44 -07:00
parent 61f716d5a8
commit 7bfeeebcb9
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Serialization/ModuleFile.cpp
View File

@@ -196,12 +196,12 @@ Status ModuleFile::associateWithFileContext(FileUnit *file, SourceLoc diagLoc) {
modulePathStr = modulePathStr.slice(0, splitPoint);
}
ImportPath::Module::Builder modulePath;
while (!modulePathStr.empty()) {
StringRef nextComponent;
std::tie(nextComponent, modulePathStr) = modulePathStr.split('\0');
modulePath.push_back(ctx.getIdentifier(nextComponent));
assert(!modulePath.back().Item.empty() &&
// TODO: Further simplification is possible by unifying scopePath above with
// this.
ImportPath::Module::Builder modulePath(ctx, modulePathStr,
/*separator=*/'\0');
for (const auto &elem : modulePath) {
assert(!elem.Item.empty() &&
"invalid module name (submodules not yet supported)");
}
auto module = getModule(modulePath.get(), /*allowLoading*/true);
@@ -474,14 +474,7 @@ void ModuleFile::getImportDecls(SmallVectorImpl<Decl *> &Results) {
if (Dep.isHeader())
continue;
ImportPath::Builder importPath;
StringRef ModulePathStr = Dep.Core.RawPath;
while (!ModulePathStr.empty()) {
StringRef NextComponent;
std::tie(NextComponent, ModulePathStr) = ModulePathStr.split('\0');
importPath.push_back(Ctx.getIdentifier(NextComponent));
}
ImportPath::Builder importPath(Ctx, Dep.Core.RawPath, /*separator=*/'\0');
if (importPath.size() == 1
&& importPath.front().Item == Ctx.StdlibModuleName)