diff options
author | Chris Lattner <sabre@nondot.org> | 2010-03-26 17:10:02 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-03-26 17:10:02 +0000 |
commit | 86851109b8f70eee7a743bc914219e4f0d8bf9f4 (patch) | |
tree | 7eaf1cf5f2e64ce8c3f205dd9c29c0c6a7379223 /lib/Lex/TokenConcatenation.cpp | |
parent | 5832a5390a8da156b84211fc1bdee5fcfb103d9c (diff) |
fix a bug in paste avoidance which would cause us to accidentally
form a >>=. Patch by Abramo Bagnara, testcase by me.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99624 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/TokenConcatenation.cpp')
-rw-r--r-- | lib/Lex/TokenConcatenation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Lex/TokenConcatenation.cpp b/lib/Lex/TokenConcatenation.cpp index 07951646ff..51d2e2326f 100644 --- a/lib/Lex/TokenConcatenation.cpp +++ b/lib/Lex/TokenConcatenation.cpp @@ -85,7 +85,7 @@ TokenConcatenation::TokenConcatenation(Preprocessor &pp) : PP(pp) { TokenInfo[tok::star ] |= aci_avoid_equal; // *= TokenInfo[tok::exclaim ] |= aci_avoid_equal; // != TokenInfo[tok::lessless ] |= aci_avoid_equal; // <<= - TokenInfo[tok::greaterequal] |= aci_avoid_equal; // >>= + TokenInfo[tok::greatergreater] |= aci_avoid_equal; // >>= TokenInfo[tok::caret ] |= aci_avoid_equal; // ^= TokenInfo[tok::equal ] |= aci_avoid_equal; // == } |