6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-21 02:24:22 +00:00
Code Issues Projects Releases Wiki Activity

simplify some code.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79121 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2009-08-15 18:00:42 +00:00
parent 7bee3271e8
commit d7e250527c
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/FileCheck/FileCheck.cpp
View File

@ -95,23 +95,27 @@ static bool ReadCheckFile(SourceMgr &SM,
} }
SM.AddNewSourceBuffer(F, SMLoc()); SM.AddNewSourceBuffer(F, SMLoc());
// Find all instances of CheckPrefix followed by : in the file. The // Find all instances of CheckPrefix followed by : in the file.
// MemoryBuffer is guaranteed to be nul terminated, but may have nul's
// embedded into it. We don't support check strings with embedded nuls.
std::string Prefix = CheckPrefix + ":";
const char *CurPtr = F->getBufferStart(), *BufferEnd = F->getBufferEnd(); const char *CurPtr = F->getBufferStart(), *BufferEnd = F->getBufferEnd();
while (1) { while (1) {
// See if Prefix occurs in the memory buffer. // See if Prefix occurs in the memory buffer.
const char *Ptr = FindFixedStringInBuffer(Prefix, CurPtr, *F); const char *Ptr = FindFixedStringInBuffer(CheckPrefix, CurPtr, *F);
// If we didn't find a match, we're done. // If we didn't find a match, we're done.
if (Ptr == BufferEnd) if (Ptr == BufferEnd)
break; break;
// Verify that the : is present after the prefix.
if (Ptr[CheckPrefix.size()] != ':') {
CurPtr = Ptr+1;
continue;
}
// Okay, we found the prefix, yay. Remember the rest of the line, but // Okay, we found the prefix, yay. Remember the rest of the line, but
// ignore leading and trailing whitespace. // ignore leading and trailing whitespace.
Ptr += Prefix.size(); Ptr += CheckPrefix.size()+1;
while (*Ptr == ' ' || *Ptr == '\t') while (*Ptr == ' ' || *Ptr == '\t')
++Ptr; ++Ptr;
@ -127,7 +131,7 @@ static bool ReadCheckFile(SourceMgr &SM,
// Check that there is something on the line. // Check that there is something on the line.
if (Ptr >= CurPtr) { if (Ptr >= CurPtr) {
SM.PrintMessage(SMLoc::getFromPointer(CurPtr), SM.PrintMessage(SMLoc::getFromPointer(CurPtr),
"found empty check string with prefix '"+Prefix+"'", "found empty check string with prefix '"+CheckPrefix+":'",
"error"); "error");
return true; return true;
} }
@ -138,7 +142,8 @@ static bool ReadCheckFile(SourceMgr &SM,
} }
if (CheckStrings.empty()) { if (CheckStrings.empty()) {
errs() << "error: no check strings found with prefix '" << Prefix << "'\n"; errs() << "error: no check strings found with prefix '" << CheckPrefix
<< ":'\n";
return true; return true;
} }