averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[libSyntax] Record reused node IDs

Browse Source 
This is cheaper than recording reused region offsets and the reused node
IDs will later be used to incrementally transfer the syntax to
SwiftSyntax.
This commit is contained in:
Alex Hoppen
2018-05-21 16:58:15 -07:00
parent 705f5b79a2
commit 419ba044f1
7 changed files with 106 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
tools/swift-syntax-test/swift-syntax-test.cpp
View File

@@ -192,14 +192,13 @@ namespace {
// A utility class to wrap a source range consisting of a byte start and end
// offset
struct ByteBasedSourceRange {
unsigned Start;
unsigned End;
uintptr_t Start;
uintptr_t End;
ByteBasedSourceRange(unsigned Start, unsigned End) : Start(Start), End(End) {
ByteBasedSourceRange(uintptr_t Start, uintptr_t End)
: Start(Start), End(End) {
assert(Start <= End);
}
ByteBasedSourceRange(SyntaxReuseRegion Pair)
: ByteBasedSourceRange(Pair.Start, Pair.End) {}
ByteBasedSourceRange() : ByteBasedSourceRange(0, 0) {}
ByteBasedSourceRange intersect(const ByteBasedSourceRange &Other) {
@@ -228,9 +227,9 @@ struct ByteBasedSourceRangeSet {
ByteBasedSourceRangeSet() {}
ByteBasedSourceRangeSet(std::vector<SyntaxReuseRegion> PairVector) {
for (auto Pair : PairVector) {
addRange(Pair);
ByteBasedSourceRangeSet(std::vector<SyntaxReuseRegion> Ranges) {
for (auto Range : Ranges) {
addRange({Range.Start.getOffset(), Range.End.getOffset()});
}
}
@@ -410,7 +409,8 @@ bool useColoredOutput() {
void printVisualNodeReuseInformation(SourceManager &SourceMgr,
unsigned BufferID,
SyntaxParsingCache *Cache) {
SyntaxParsingCache *Cache,
const SourceFileSyntax &NewSyntaxTree) {
unsigned CurrentOffset = 0;
auto SourceText = SourceMgr.getEntireTextForBuffer(BufferID);
if (useColoredOutput()) {
@@ -436,13 +436,14 @@ void printVisualNodeReuseInformation(SourceManager &SourceMgr,
}
};
for (auto ReuseRange : Cache->getReusedRanges()) {
for (auto ReuseRange : Cache->getReusedRegions(NewSyntaxTree)) {
auto StartOffset = ReuseRange.Start.getOffset();
auto EndOffset = ReuseRange.End.getOffset();
// Print region that was not reused
PrintReparsedRegion(SourceText, CurrentOffset, ReuseRange.Start);
PrintReparsedRegion(SourceText, CurrentOffset, StartOffset);
llvm::outs() << SourceText.substr(ReuseRange.Start,
ReuseRange.End - ReuseRange.Start);
CurrentOffset = ReuseRange.End;
llvm::outs() << SourceText.substr(StartOffset, EndOffset - StartOffset);
CurrentOffset = EndOffset;
}
PrintReparsedRegion(SourceText, CurrentOffset, SourceText.size());
if (useColoredOutput())
@@ -451,21 +452,16 @@ void printVisualNodeReuseInformation(SourceManager &SourceMgr,
llvm::outs() << '\n';
}
void saveReuseLog(SourceManager &SourceMgr, unsigned BufferID,
SyntaxParsingCache *Cache) {
void saveReuseLog(SyntaxParsingCache *Cache,
const SourceFileSyntax &NewSyntaxTree) {
std::error_code ErrorCode;
llvm::raw_fd_ostream ReuseLog(options::IncrementalReuseLog, ErrorCode,
llvm::sys::fs::OpenFlags::F_RW);
assert(!ErrorCode && "Unable to open incremental usage log");
for (auto ReuseRange : Cache->getReusedRanges()) {
SourceLoc Start = SourceMgr.getLocForOffset(BufferID, ReuseRange.Start);
SourceLoc End = SourceMgr.getLocForOffset(BufferID, ReuseRange.End);
ReuseLog << "Reused ";
Start.printLineAndColumn(ReuseLog, SourceMgr, BufferID);
ReuseLog << " to ";
End.printLineAndColumn(ReuseLog, SourceMgr, BufferID);
for (auto ReuseRange : Cache->getReusedRegions(NewSyntaxTree)) {
ReuseLog << "Reused " << ReuseRange.Start << " to " << ReuseRange.End
<< '\n';
ReuseLog << '\n';
}
}
@@ -494,7 +490,8 @@ bool verifyReusedRegions(ByteBasedSourceRangeSet ExpectedReparseRegions,
auto FileLength = SourceMgr.getRangeForBuffer(BufferID).getByteLength();
// Compute the repared regions by inverting the reused regions
auto ReusedRanges = ByteBasedSourceRangeSet(SyntaxCache->getReusedRanges());
auto ReusedRanges = ByteBasedSourceRangeSet(
SyntaxCache->getReusedRegions(SF->getSyntaxRoot()));
auto ReparsedRegions = ReusedRanges.invert(FileLength);
// Same for expected reuse regions
@@ -552,8 +549,6 @@ int parseFile(const char *MainExecutablePath, const StringRef InputFileName,
}
SyntaxCache = new SyntaxParsingCache(OldSyntaxTree.getValue());
SyntaxCache->setRecordReuseInformation();
if (options::OldSourceFilename.empty()) {
llvm::errs() << "The old syntax file must be provided to translate "
"line:column edits to byte offsets";
@@ -608,10 +603,10 @@ int parseFile(const char *MainExecutablePath, const StringRef InputFileName,
if (SyntaxCache) {
if (options::PrintVisualReuseInfo) {
printVisualNodeReuseInformation(Instance.getSourceMgr(), BufferID,
SyntaxCache);
SyntaxCache, SF->getSyntaxRoot());
}
if (!options::IncrementalReuseLog.empty()) {
saveReuseLog(Instance.getSourceMgr(), BufferID, SyntaxCache);
saveReuseLog(SyntaxCache, SF->getSyntaxRoot());
}
ByteBasedSourceRangeSet ExpectedReparseRegions;
@@ -670,8 +665,7 @@ int doDumpRawTokenSyntax(const StringRef InputFile) {
}
for (auto TokAndPos : Tokens) {
TokAndPos.second.printLineAndColumn(llvm::outs());
llvm::outs() << "\n";
llvm::outs() << TokAndPos.second << "\n";
TokAndPos.first->dump(llvm::outs());
llvm::outs() << "\n";
}