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

Revert "Print source ranges of the AST nodes when dumping the AST."

Browse Source 
See if it fixes the buildbot.
This reverts commit 5957.

Swift SVN r5960
This commit is contained in:
Argyrios Kyrtzidis
2013-07-02 16:45:07 +00:00
parent 0a3fc1b195
commit f478157ab4
4 changed files with 57 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/Basic/SourceLoc.cpp
View File

@@ -17,7 +17,7 @@
using namespace swift;
void SourceLoc::print(raw_ostream &OS, const llvm::SourceMgr &SM,
int &LastBuffer, int &LastLine) const {
int &LastBuffer) const {
if (isInvalid()) {
OS << "<invalid loc>";
return;
@@ -27,20 +27,17 @@ void SourceLoc::print(raw_ostream &OS, const llvm::SourceMgr &SM,
OS << "<malformed loc>";
return;
}
auto LineAndCol = SM.getLineAndColumn(Value, BufferIndex);
if (BufferIndex != LastBuffer) {
OS << SM.getMemoryBuffer((unsigned)BufferIndex)->getBufferIdentifier();
LastBuffer = BufferIndex;
LastLine = LineAndCol.first;
OS << ':' << LineAndCol.first << ':' << LineAndCol.second;
} else if (LineAndCol.first != unsigned(LastLine)) {
LastLine = LineAndCol.first;
OS << "line:" << LineAndCol.first << ':' << LineAndCol.second;
} else {
OS << "col:" << LineAndCol.second;
OS << "line";
}
auto LineAndCol = SM.getLineAndColumn(Value, BufferIndex);
OS << ':' << LineAndCol.first << ':' << LineAndCol.second;
}
void SourceLoc::dump(const llvm::SourceMgr &SM) const {
@@ -48,22 +45,20 @@ void SourceLoc::dump(const llvm::SourceMgr &SM) const {
}
void SourceRange::print(raw_ostream &OS, const llvm::SourceMgr &SM,
int &LastBuffer, int &LastLine, bool PrintText) const {
int &LastBuffer) const {
OS << '[';
Start.print(OS, SM, LastBuffer, LastLine);
Start.print(OS, SM, LastBuffer);
OS << " - ";
End.print(OS, SM, LastBuffer, LastLine);
End.print(OS, SM, LastBuffer);
OS << ']';
if (Start.isInvalid() || End.isInvalid())
return;
if (PrintText) {
OS << " RangeText=\""
<< StringRef(Start.Value.getPointer(),
End.Value.getPointer() - Start.Value.getPointer()+1)
<< '"';
}
OS << " RangeText=\""
<< StringRef(Start.Value.getPointer(),
End.Value.getPointer() - Start.Value.getPointer()+1)
<< '"';
}
void SourceRange::dump(const llvm::SourceMgr &SM) const {