summaryrefslogtreecommitdiffstats
path: root/clang
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
commit6aab73137ad652498e42861db77462f5e33a3c70 (patch)
tree82c1af4051268bb1311943feeae451759dbfaada /clang
parentf3935b4d4bf3579d7911722742bbf45b57c588ee (diff)
downloadbcm5719-llvm-6aab73137ad652498e42861db77462f5e33a3c70.tar.gz
bcm5719-llvm-6aab73137ad652498e42861db77462f5e33a3c70.zip
minor tidy.
llvm-svn: 90543
Diffstat (limited to 'clang')
-rw-r--r--clang/lib/Lex/TokenLexer.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp
index f006f5ae55b..5f70b056944 100644
--- a/clang/lib/Lex/TokenLexer.cpp
+++ b/clang/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
OpenPOWER on IntegriCloud