diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Lex/TokenConcatenation.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Preprocessor/output_paste_avoid.c | 4 |
2 files changed, 5 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; // == } diff --git a/clang/test/Preprocessor/output_paste_avoid.c b/clang/test/Preprocessor/output_paste_avoid.c index 835a921fb7d..8c6173a78d1 100644 --- a/clang/test/Preprocessor/output_paste_avoid.c +++ b/clang/test/Preprocessor/output_paste_avoid.c @@ -24,3 +24,7 @@ E: test(str) // Should expand to L "str" not L"str" // CHECK: E: L "str" +// Should avoid producing >>=. +#define equal = +F: >>equal +// CHECK: F: >> = |
