OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Replace a char counting helper function with std::count. 

No functionality change.

llvm-svn: 158272
This commit is contained in:
Benjamin Kramer 2012-06-09 13:18:14 +00:00
parent a74cf08e68
commit 7132638995
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/Rewrite/InclusionRewriter.cpp
View File

@ -174,16 +174,6 @@ InclusionRewriter::FindFileChangeLocation(SourceLocation Loc) const {
return NULL; return NULL;
} }
/// Count the raw \\n characters in the \p Len characters from \p Pos.
inline unsigned CountNewLines(const char *Pos, int Len) {
const char *End = Pos + Len;
unsigned Lines = 0;
--Pos;
while ((Pos = static_cast<const char*>(memchr(Pos + 1, '\n', End - Pos - 1))))
++Lines;
return Lines;
}
/// Detect the likely line ending style of \p FromFile by examining the first /// Detect the likely line ending style of \p FromFile by examining the first
/// newline found within it. /// newline found within it.
static StringRef DetectEOL(const MemoryBuffer &FromFile) { static StringRef DetectEOL(const MemoryBuffer &FromFile) {
@ -209,8 +199,8 @@ void InclusionRewriter::OutputContentUpTo(const MemoryBuffer &FromFile,
return; return;
OS.write(FromFile.getBufferStart() + WriteFrom, WriteTo - WriteFrom); OS.write(FromFile.getBufferStart() + WriteFrom, WriteTo - WriteFrom);
// count lines manually, it's faster than getPresumedLoc() // count lines manually, it's faster than getPresumedLoc()
Line += CountNewLines(FromFile.getBufferStart() + WriteFrom, Line += std::count(FromFile.getBufferStart() + WriteFrom,
WriteTo - WriteFrom); FromFile.getBufferStart() + WriteTo, '\n');
if (EnsureNewline) { if (EnsureNewline) {
char LastChar = FromFile.getBufferStart()[WriteTo - 1]; char LastChar = FromFile.getBufferStart()[WriteTo - 1];
if (LastChar != '\n' && LastChar != '\r') if (LastChar != '\n' && LastChar != '\r')