diff options
author | Daniel Jasper <djasper@google.com> | 2013-03-13 17:13:53 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2013-03-13 17:13:53 +0000 |
commit | 6a365aaa057a8c445d25344c0433726c752b3e7d (patch) | |
tree | a7311cda36c5471ae8a3053a09b2b63276a333e5 /lib/Format/TokenAnnotator.cpp | |
parent | 3258d4b3fb5922027747217e5e6f81a11878600d (diff) |
Fix incorrect cast identification.
Before: int a = sizeof(int *)+ b;"
After: int a = sizeof(int *) + b;
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176957 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/TokenAnnotator.cpp')
-rw-r--r-- | lib/Format/TokenAnnotator.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 67ad86b624..db5924c8a5 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -621,7 +621,11 @@ private: bool ParensCouldEndDecl = !Current.Children.empty() && Current.Children[0].isOneOf(tok::equal, tok::semi, tok::l_brace); - if (ParensNotExpr && !ParensCouldEndDecl && + bool IsSizeOfOrAlignOf = + Current.MatchingParen && Current.MatchingParen->Parent && + Current.MatchingParen->Parent->isOneOf(tok::kw_sizeof, + tok::kw_alignof); + if (ParensNotExpr && !ParensCouldEndDecl && !IsSizeOfOrAlignOf && Contexts.back().IsExpression) // FIXME: We need to get smarter and understand more cases of casts. Current.Type = TT_CastRParen; @@ -894,7 +898,7 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line, if (Right.isOneOf(tok::arrow, tok::period)) { if (Line.Type == LT_BuilderTypeCall) - return 14; + return prec::PointerToMember; if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen && Left.MatchingParen->ParameterCount > 0) return 20; // Should be smaller than breaking at a nested comma. |