[cfe-commits] r90543 - /cfe/trunk/lib/Lex/TokenLexer.cpp
Chris Lattner
sabre at nondot.org
Thu Dec 3 22:14:03 PST 2009
Author: lattner
Date: Fri Dec 4 00:14:03 2009
New Revision: 90543
URL: http://llvm.org/viewvc/llvm-project?rev=90543&view=rev
Log:
minor tidy.
Modified:
cfe/trunk/lib/Lex/TokenLexer.cpp
Modified: cfe/trunk/lib/Lex/TokenLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/TokenLexer.cpp?rev=90543&r1=90542&r2=90543&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/TokenLexer.cpp (original)
+++ cfe/trunk/lib/Lex/TokenLexer.cpp Fri Dec 4 00:14:03 2009
@@ -321,13 +321,12 @@
// 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
More information about the cfe-commits
mailing list