diff options
| author | Manuel Klimek <klimek@google.com> | 2013-01-05 22:56:06 +0000 |
|---|---|---|
| committer | Manuel Klimek <klimek@google.com> | 2013-01-05 22:56:06 +0000 |
| commit | f6fd00b12ae7d89436d32851c9bcc8dd3d046ad3 (patch) | |
| tree | c8d17d46d1f754bf515acb33f861ee31fd044b56 /lib/Format/Format.cpp | |
| parent | c37b4d60f926bf440dfcc312bd6482fed3176e33 (diff) | |
Fixes parsing of hash tokens in the middle of a line.
To parse # correctly, we need to know whether it is the first token in a
line - we can deduct this either from the whitespace or seeing that the
token is the first in the file - we already calculate this information.
This patch moves the identification of the first token into the
getNextToken method and stores it inside the FormatToken, so the
UnwrappedLineParser can stay independent of the SourceManager.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171640 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/Format.cpp')
| -rw-r--r-- | lib/Format/Format.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index effe0bc248..4d401a5be9 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -483,8 +483,7 @@ private: unsigned Newlines = std::min(Token.NewlinesBefore, Style.MaxEmptyLinesToKeep + 1); - unsigned Offset = SourceMgr.getFileOffset(Token.WhiteSpaceStart); - if (Newlines == 0 && Offset != 0) + if (Newlines == 0 && !Token.IsFirst) Newlines = 1; unsigned Indent = Line.Level * 2; if ((Token.Tok.is(tok::kw_public) || Token.Tok.is(tok::kw_protected) || @@ -685,9 +684,10 @@ public: next(); if (Index >= Tokens.size()) return; - // It is the responsibility of the UnwrappedLineParser to make sure - // this sequence is not produced inside an unwrapped line. - assert(Tokens[Index].Tok.getIdentifierInfo() != NULL); + // Hashes in the middle of a line can lead to any strange token + // sequence. + if (Tokens[Index].Tok.getIdentifierInfo() == NULL) + return; switch (Tokens[Index].Tok.getIdentifierInfo()->getPPKeywordID()) { case tok::pp_include: case tok::pp_import: @@ -1033,6 +1033,8 @@ public: Lex.LexFromRawLexer(FormatTok.Tok); StringRef Text = tokenText(FormatTok.Tok); FormatTok.WhiteSpaceStart = FormatTok.Tok.getLocation(); + if (SourceMgr.getFileOffset(FormatTok.WhiteSpaceStart) == 0) + FormatTok.IsFirst = true; // Consume and record whitespace until we find a significant token. while (FormatTok.Tok.is(tok::unknown)) { |