diff options
| author | Daniel Jasper <djasper@google.com> | 2015-10-07 01:41:14 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-10-07 01:41:14 +0000 |
| commit | 0ea4d799e3f196733f69712dfd83129dbd5fabd5 (patch) | |
| tree | 57856c8bf74e0536c5d3df565a648a8acbb25f42 /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 10e6a61892f877a51034abf283deaa8c488779d0 (diff) | |
| download | bcm5719-llvm-0ea4d799e3f196733f69712dfd83129dbd5fabd5.tar.gz bcm5719-llvm-0ea4d799e3f196733f69712dfd83129dbd5fabd5.zip | |
clang-format: Fix false positive in pointer/reference detection.
Before:
return options != nullptr &&operator==(*options);
After:
return options != nullptr && operator==(*options);
llvm-svn: 249501
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index f6a80342dc7..55a1ddd91c0 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1158,7 +1158,9 @@ private: if (NextToken->is(tok::l_square) && NextToken->isNot(TT_LambdaLSquare)) return TT_PointerOrReference; - if (NextToken->isOneOf(tok::kw_operator, tok::comma, tok::semi)) + if (NextToken->is(tok::kw_operator) && !IsExpression) + return TT_PointerOrReference; + if (NextToken->isOneOf(tok::comma, tok::semi)) return TT_PointerOrReference; if (PrevToken->is(tok::r_paren) && PrevToken->MatchingParen && |
