summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2016-11-01 06:23:05 +0000
committerDaniel Jasper <djasper@google.com>2016-11-01 06:23:05 +0000
commit3ade3be2a1e97fdac987638cf9470930f61f49d5 (patch)
treeb0b19b33e5294057bb8e371a8ab9608011535002 /clang/lib/Format
parent71e50af675c12197ebaf8d2782e8a9a59c428e29 (diff)
downloadbcm5719-llvm-3ade3be2a1e97fdac987638cf9470930f61f49d5.tar.gz
bcm5719-llvm-3ade3be2a1e97fdac987638cf9470930f61f49d5.zip
clang-format: Fix incorrect binary operator detection.
Before: int x = f(* + [] {}); After: int x = f(*+[] {}); llvm-svn: 285671
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 5a0d592a145..129fe844904 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1310,7 +1310,7 @@ private:
TokenType determinePlusMinusCaretUsage(const FormatToken &Tok) {
const FormatToken *PrevToken = Tok.getPreviousNonComment();
- if (!PrevToken || PrevToken->is(TT_CastRParen))
+ if (!PrevToken || PrevToken->isOneOf(TT_CastRParen, TT_UnaryOperator))
return TT_UnaryOperator;
// Use heuristics to recognize unary operators.
OpenPOWER on IntegriCloud