summaryrefslogtreecommitdiffstats
path: root/lib/Lex/TokenLexer.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-12-04 06:14:03 +0000
committerChris Lattner <sabre@nondot.org>2009-12-04 06:14:03 +0000
commit04f2bd859ba6a23faf98eb3cc7d40e9adf6d5eaa (patch)
tree22cc5c56ec586fc445b20b27221707a0cfaabafb /lib/Lex/TokenLexer.cpp
parent3aaf486af649d6be464e6b937c8181529ffef931 (diff)
minor tidy.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90543 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/TokenLexer.cpp')
-rw-r--r--lib/Lex/TokenLexer.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp
index f006f5ae55..5f70b05694 100644
--- a/lib/Lex/TokenLexer.cpp
+++ b/lib/Lex/TokenLexer.cpp
@@ -321,13 +321,12 @@ void TokenLexer::Lex(Token &Tok) {
// If this token is followed by a token paste (##) operator, paste the tokens!
if (!isAtEnd() && Tokens[CurToken].is(tok::hashhash)) {
- if (PasteTokens(Tok)) {
- // When handling the microsoft /##/ extension, the final token is
- // returned by PasteTokens, not the pasted token.
+ // When handling the microsoft /##/ extension, the final token is
+ // returned by PasteTokens, not the pasted token.
+ if (PasteTokens(Tok))
return;
- } else {
- TokenIsFromPaste = true;
- }
+
+ TokenIsFromPaste = true;
}
// The token's current location indicate where the token was lexed from. We