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

Simplify the implementation of SourceManager::decompose() and its client

Browse Source 
Swift SVN r7119
This commit is contained in:
Dmitri Hrybenko
2013-08-10 01:32:42 +00:00
parent 0761a2ebd7
commit 09837a1b88
2 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Basic/SourceLoc.cpp
View File

@@ -45,14 +45,8 @@ DecomposedLoc SourceManager::decompose(SourceLoc Loc) const {
DecomposedLoc Result;
Result.Buffer = LLVMSourceMgr.getMemoryBuffer(BufferID);
Result.Line = LLVMSourceMgr.FindLineNumber(Loc.Value, BufferID);
const char *BufferStart = Result.Buffer->getBufferStart();
const char *LineStart = Loc.Value.getPointer();
while (LineStart != BufferStart &&
LineStart[-1] != '\n' && LineStart[-1] != '\r')
--LineStart;
Result.Column = Loc.Value.getPointer() - LineStart;
std::tie(Result.Line, Result.Column) =
LLVMSourceMgr.getLineAndColumn(Loc.Value, BufferID);
return Result;
}