maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Improve formatting of function types. 

Before: void * (*a)(int *, SomeType *);
After:  void *(*a)(int *, SomeType *);
llvm-svn: 178474
This commit is contained in:
Daniel Jasper 2013-04-01 17:13:26 +00:00
parent 39caf9f5ec
commit 6e42b1eb8b
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/lib/Format/Format.cpp
View File

@ -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 ||

12
clang/lib/Format/TokenAnnotator.cpp
View File

@ -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;

6
clang/unittests/Format/FormatTest.cpp
View File

@ -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) {