diff options
| -rw-r--r-- | lib/Format/Format.cpp | 1 | ||||
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 12 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp index 245b7f60a6..e8a8388387 100644 --- a/lib/Format/Format.cpp +++ b/lib/Format/Format.cpp @@ -805,7 +805,6 @@ private: // parameter, i.e. let nested calls have an indent of 4. State.Stack.back().LastSpace = State.Column + 1; // 1 is length of "(". else if (Previous.is(tok::comma)) - // Top-level spaces are exempt as that mostly leads to better results. State.Stack.back().LastSpace = State.Column; else if ((Previous.Type == TT_BinaryOperator || Previous.Type == TT_ConditionalExpr || diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 25670d4f68..23c5a46355 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -682,12 +682,6 @@ private: NextToken->FormatTok.Tok.isLiteral() || isUnaryOperator(*NextToken)) return TT_BinaryOperator; - // "*(" is probably part of a function type if within template parameters. - // Otherwise, it is probably a binary operator. - if (NextToken->is(tok::l_paren)) - return Contexts.back().ContextKind == tok::less ? TT_PointerOrReference - : TT_BinaryOperator; - // It is very unlikely that we are going to find a pointer or reference type // definition on the RHS of an assignment. if (IsExpression) @@ -993,7 +987,8 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, if (Left.Type == TT_PointerOrReference) return Right.FormatTok.Tok.isLiteral() || ((Right.Type != TT_PointerOrReference) && - Right.isNot(tok::l_paren) && Style.PointerBindsToType); + Right.isNot(tok::l_paren) && Style.PointerBindsToType && + Left.Parent && Left.Parent->isNot(tok::l_paren)); if (Right.is(tok::star) && Left.is(tok::l_paren)) return false; if (Left.is(tok::l_square)) @@ -1057,7 +1052,8 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, Tok.Children[0].Type == TT_PointerOrReference && !Tok.Children[0].Children.empty() && Tok.Children[0].Children[0].isNot(tok::r_paren) && - Tok.Parent->isNot(tok::l_paren)) + Tok.Parent->isNot(tok::l_paren) && + (Tok.Parent->Type != TT_PointerOrReference || Style.PointerBindsToType)) return true; if (Tok.Parent->Type == TT_UnaryOperator || Tok.Parent->Type == TT_CastRParen) return false; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 83c7a2adbf..62ce4c33ac 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -2213,7 +2213,7 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { verifyIndependentOfContext("a[a * a] = 1;"); verifyIndependentOfContext("f() * b;"); verifyIndependentOfContext("a * [self dostuff];"); - verifyIndependentOfContext("a * (a + b);"); + verifyIndependentOfContext("int x = a * (a + b);"); verifyIndependentOfContext("(a *)(a + b);"); verifyIndependentOfContext("int *pa = (int *)&a;"); verifyIndependentOfContext("return sizeof(int **);"); @@ -2378,12 +2378,14 @@ TEST_F(FormatTest, FormatsFunctionTypes) { verifyFormat("A<SomeType()> a;"); verifyFormat("A<void(*)(int, std::string)> a;"); verifyFormat("A<void *(int)>;"); + verifyFormat("void *(*a)(int *, SomeType *);"); // FIXME: Inconsistent. verifyFormat("int (*func)(void *);"); verifyFormat("void f() { int(*func)(void *); }"); - verifyGoogleFormat("A<void*(int)>;"); + verifyGoogleFormat("A<void*(int*, SomeType*)>;"); + verifyGoogleFormat("void* (*a)(int);"); } TEST_F(FormatTest, BreaksLongDeclarations) { |