Comment parsing: don't parse whitespace before \endverbatim as a separate line of whitespace.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160464 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/CommentLexer.cpp b/lib/AST/CommentLexer.cpp
index 5b411ca..3146832 100644
--- a/lib/AST/CommentLexer.cpp
+++ b/lib/AST/CommentLexer.cpp
@@ -201,6 +201,10 @@
return BufferEnd;
}
+bool isWhitespace(const char *BufferPtr, const char *BufferEnd) {
+ return skipWhitespace(BufferPtr, BufferEnd) == BufferEnd;
+}
+
bool isCommandNameCharacter(char C) {
return (C >= 'a' && C <= 'z') ||
(C >= 'A' && C <= 'Z') ||
@@ -429,6 +433,7 @@
}
void Lexer::lexVerbatimBlockFirstLine(Token &T) {
+again:
assert(BufferPtr < CommentEnd);
// FIXME: It would be better to scan the text once, finding either the block
@@ -458,6 +463,11 @@
// There is some text, followed by end command. Extract text first.
TextEnd = BufferPtr + Pos;
NextLine = TextEnd;
+ // If there is only whitespace before end command, skip whitespace.
+ if (isWhitespace(BufferPtr, TextEnd)) {
+ BufferPtr = TextEnd;
+ goto again;
+ }
}
StringRef Text(BufferPtr, TextEnd - BufferPtr);