Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remap source/target paths for includes #35

Merged
merged 5 commits into from
Sep 19, 2019
Merged

Remap source/target paths for includes #35

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d9965a
Remap source/target paths for includes
indragiek Sep 19, 2019
b68c565
Fix typo in code comment
indragiek Sep 19, 2019
2f01a5f
Log sourcePath and targetPath if Verbose is enabled
indragiek Sep 19, 2019
85f9587
Prefix log messages with Include
indragiek Sep 19, 2019
7823e0d
Make log messages valid YAML
indragiek Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions index-import.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,16 @@ static IndexUnitWriter remapUnit(const std::unique_ptr<IndexUnitReader> &reader,
});

reader->foreachInclude([&](const IndexUnitReader::IncludeInfo &info) {
// Note this isn't revelevnt to Swift.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😂

Copy link
Contributor

@kastiglione kastiglione Sep 19, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revelevn't – obviously

writer.addInclude(fileMgr.getFile(info.SourcePath), info.SourceLine,
fileMgr.getFile(info.TargetPath));
const auto sourcePath = remapper.remap(info.SourcePath);
const auto targetPath = remapper.remap(info.TargetPath);
if (Verbose) {
*outs << "IncludeSourcePath: " << sourcePath << "\n"
<< "IncludeTargetPath: " << targetPath << "\n";
}

// Note this isn't relevant to Swift.
writer.addInclude(fileMgr.getFile(sourcePath), info.SourceLine,
fileMgr.getFile(targetPath));
return true;
});

Expand Down