diff options
| author | Jim Grosbach <grosbach@apple.com> | 2011-09-15 16:52:06 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2011-09-15 16:52:06 +0000 |
| commit | 70796ca867132fd8c767301061afb9760cd69167 (patch) | |
| tree | c3a11639a30329b96d2237278ea1e983b09e60dc | |
| parent | 6b6e32d954233ddeeae7f99e358ff85059f1176a (diff) | |
| download | llvm-70796ca867132fd8c767301061afb9760cd69167.tar.gz llvm-70796ca867132fd8c767301061afb9760cd69167.tar.bz2 llvm-70796ca867132fd8c767301061afb9760cd69167.tar.xz | |
Handle missing newline at EOF more gracefully in MC AsmLexer.
If we see an EOF w/o a preceding end-of-line, return an EndOfStatement
token before returning the Eof token.
Based on patch by Stepan Dyatkovskiy.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139798 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/MC/MCParser/AsmLexer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/MC/MCParser/AsmLexer.cpp b/lib/MC/MCParser/AsmLexer.cpp index e446a83a58..c76052d66e 100644 --- a/lib/MC/MCParser/AsmLexer.cpp +++ b/lib/MC/MCParser/AsmLexer.cpp @@ -375,8 +375,15 @@ AsmToken AsmLexer::LexToken() { return AsmToken(AsmToken::EndOfStatement, StringRef(TokStart, strlen(MAI.getSeparatorString()))); } - isAtStartOfLine = false; + // If we're missing a newline at EOF, make sure we still get an + // EndOfStatement token before the Eof token. + if (CurChar == EOF && !isAtStartOfLine) { + isAtStartOfLine = true; + return AsmToken(AsmToken::EndOfStatement, StringRef(TokStart, 1)); + } + + isAtStartOfLine = false; switch (CurChar) { default: // Handle identifier: [a-zA-Z_.][a-zA-Z0-9_$.@]* |