using namespace llvm;
-line_iterator::line_iterator(const MemoryBuffer &Buffer, char CommentMarker)
- : Buffer(Buffer.getBufferSize() ? &Buffer : 0),
- CommentMarker(CommentMarker), LineNumber(1),
- CurrentLine(Buffer.getBufferSize() ? Buffer.getBufferStart() : 0, 0) {
+line_iterator::line_iterator(const MemoryBuffer &Buffer, bool SkipBlanks,
+ char CommentMarker)
+ : Buffer(Buffer.getBufferSize() ? &Buffer : nullptr),
+ CommentMarker(CommentMarker), SkipBlanks(SkipBlanks), LineNumber(1),
+ CurrentLine(Buffer.getBufferSize() ? Buffer.getBufferStart() : nullptr,
+ 0) {
// Ensure that if we are constructed on a non-empty memory buffer that it is
// a null terminated buffer.
if (Buffer.getBufferSize()) {
assert(Buffer.getBufferEnd()[0] == '\0');
- advance();
+ // Make sure we don't skip a leading newline if we're keeping blanks
+ if (SkipBlanks || *Buffer.getBufferStart() != '\n')
+ advance();
}
}
const char *Pos = CurrentLine.end();
assert(Pos == Buffer->getBufferStart() || *Pos == '\n' || *Pos == '\0');
- size_t Length = 0;
- if (CommentMarker == '\0') {
+ if (*Pos == '\n') {
+ ++Pos;
+ ++LineNumber;
+ }
+ if (!SkipBlanks && *Pos == '\n') {
+ // Nothing to do for a blank line.
+ } else if (CommentMarker == '\0') {
// If we're not stripping comments, this is simpler.
- while (Pos[Length] == '\n')
- ++Length;
- Pos += Length;
- LineNumber += Length;
- Length = 0;
+ size_t Blanks = 0;
+ while (Pos[Blanks] == '\n')
+ ++Blanks;
+ Pos += Blanks;
+ LineNumber += Blanks;
} else {
// Skip comments and count line numbers, which is a bit more complex.
for (;;) {
+ if (*Pos == '\n' && !SkipBlanks)
+ break;
if (*Pos == CommentMarker)
do {
++Pos;
if (*Pos == '\0') {
// We've hit the end of the buffer, reset ourselves to the end state.
- Buffer = 0;
+ Buffer = nullptr;
CurrentLine = StringRef();
return;
}
// Measure the line.
- do {
+ size_t Length = 0;
+ while (Pos[Length] != '\0' && Pos[Length] != '\n') {
++Length;
- } while (Pos[Length] != '\0' && Pos[Length] != '\n');
+ }
CurrentLine = StringRef(Pos, Length);
}