aboutsummaryrefslogtreecommitdiff
path: root/lib/Format
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2013-01-12 05:47:16 +0000
committerNico Weber <nicolasweber@gmx.de>2013-01-12 05:47:16 +0000
commit2355cebe3847acd4ce175e3a88788b8effd93c6e (patch)
tree2106bd186b90037876ec7a4b4700e887c47999d3 /lib/Format
parentcc191d1980101bba47d3d67acf782890076fa5c3 (diff)
Formatter: * and & are binary operators after ) and ].
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172302 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format')
-rw-r--r--lib/Format/Format.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 5140639d00..e4dc291312 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -969,7 +969,8 @@ private:
Tok.Parent->Type == TT_CastRParen)
return TT_UnaryOperator;
- if (PrevToken.Tok.isLiteral() || NextToken.Tok.isLiteral() ||
+ if (PrevToken.Tok.isLiteral() || PrevToken.Tok.is(tok::r_paren) ||
+ PrevToken.Tok.is(tok::r_square) || NextToken.Tok.isLiteral() ||
NextToken.Tok.is(tok::plus) || NextToken.Tok.is(tok::minus) ||
NextToken.Tok.is(tok::plusplus) || NextToken.Tok.is(tok::minusminus) ||
NextToken.Tok.is(tok::tilde) || NextToken.Tok.is(tok::exclaim) ||