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 | 80dbccd1bfd7c7d97885c8560cd6efd2f468fc3c (patch) | |
| tree | 81ba165c35d67349a563a18f2b35245856e5f8a8 /clang/lib/Lex/TokenConcatenation.cpp | |
| parent | 6efe46cced9f5a4cde9949e8686c3a82c73912dc (diff) | |
| download | bcm5719-llvm-80dbccd1bfd7c7d97885c8560cd6efd2f468fc3c.tar.gz bcm5719-llvm-80dbccd1bfd7c7d97885c8560cd6efd2f468fc3c.zip | |
fix a bug in paste avoidance which would cause us to accidentally
form a >>=. Patch by Abramo Bagnara, testcase by me.
llvm-svn: 99624
Diffstat (limited to 'clang/lib/Lex/TokenConcatenation.cpp')
| -rw-r--r-- | clang/lib/Lex/TokenConcatenation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Lex/TokenConcatenation.cpp b/clang/lib/Lex/TokenConcatenation.cpp index 07951646ffe..51d2e2326fc 100644 --- a/clang/lib/Lex/TokenConcatenation.cpp +++ b/clang/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; // == } |
