Fixed some problems with the logic of parsing line comments by adding
isAtStartOfComment and using that instead in two places where a loop
to check if the char was in MAI.getCommentString().
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82059 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvm-mc/AsmLexer.cpp b/tools/llvm-mc/AsmLexer.cpp
index 2016f93..be8f60d 100644
--- a/tools/llvm-mc/AsmLexer.cpp
+++ b/tools/llvm-mc/AsmLexer.cpp
@@ -232,27 +232,30 @@
StringRef AsmLexer::LexUntilEndOfStatement() {
TokStart = CurPtr;
- while (*CurPtr != ';' && // End of statement marker.
+ while (!isAtStartOfComment(*CurPtr) && // Start of line comment.
+ *CurPtr != ';' && // End of statement marker.
*CurPtr != '\n' &&
*CurPtr != '\r' &&
(*CurPtr != 0 || CurPtr != CurBuf->getBufferEnd())) {
- // check for start of line comment.
- for (const char *p = MAI.getCommentString(); *p != 0; ++p)
- if (*CurPtr == *p)
- break;
++CurPtr;
}
return StringRef(TokStart, CurPtr-TokStart);
}
+bool AsmLexer::isAtStartOfComment(char Char) {
+ for (const char *p = MAI.getCommentString(); *p != 0; ++p)
+ if (Char == *p)
+ return true;
+ return false;
+}
+
AsmToken AsmLexer::LexToken() {
TokStart = CurPtr;
// This always consumes at least one character.
int CurChar = getNextChar();
- for (const char *p = MAI.getCommentString(); *p != 0; ++p)
- if (CurChar == *p)
- return LexLineComment();
+ if (isAtStartOfComment(CurChar))
+ return LexLineComment();
switch (CurChar) {
default: