diff options
| author | Daniel Jasper <djasper@google.com> | 2013-03-01 17:13:29 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-03-01 17:13:29 +0000 |
| commit | 8a5d7cd100ebfb8c6b353ee4ad5b14ab4105d32d (patch) | |
| tree | 7533ffe23c41a82b1630321db78f7fe680e7f468 /lib/Format | |
| parent | 9b5b65957c6830af92dd1d62cbf8e341c95bc283 (diff) | |
Correctly format arrays of pointers and function types.
Before:
void f(Type(*parameter)[10]) {}
int(*func)(void *);
After:
void f(Type (*parameter)[10]) {}
int (*func)(void *);
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176356 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format')
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 125619ccf6..f642a70309 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -645,6 +645,9 @@ private: if (NextToken == NULL) return TT_Unknown; + if (PrevToken->is(tok::l_paren) && !IsExpression) + return TT_PointerOrReference; + if (PrevToken->is(tok::l_paren) || PrevToken->is(tok::l_square) || PrevToken->is(tok::l_brace) || PrevToken->is(tok::comma) || PrevToken->is(tok::kw_return) || PrevToken->is(tok::colon) || @@ -1041,6 +1044,11 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line, if (Tok.is(tok::colon)) return Line.First.isNot(tok::kw_case) && !Tok.Children.empty() && Tok.Type != TT_ObjCMethodExpr; + if (Tok.is(tok::l_paren) && !Tok.Children.empty() && + Tok.Children[0].Type == TT_PointerOrReference && + !Tok.Children[0].Children.empty() && + Tok.Children[0].Children[0].isNot(tok::r_paren)) + return true; if (Tok.Parent->Type == TT_UnaryOperator || Tok.Parent->Type == TT_CastRParen) return false; if (Tok.Type == TT_UnaryOperator) |