diff options
| author | Daniel Jasper <djasper@google.com> | 2013-03-20 09:53:18 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-03-20 09:53:18 +0000 |
| commit | b8914dd4715130124f1c51a31a05db1833dcba19 (patch) | |
| tree | c9a291b6ae6a54d922c6869e5003025ced54e52d /clang/lib/Format | |
| parent | 168ee99ffad57a18b0c808451efcd1278b018613 (diff) | |
| download | bcm5719-llvm-b8914dd4715130124f1c51a31a05db1833dcba19.tar.gz bcm5719-llvm-b8914dd4715130124f1c51a31a05db1833dcba19.zip | |
Improve formatting of function types in template parameters.
Before: A<int * (int)>;
After: A<int *(int)>;
llvm-svn: 177505
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 4ac4c9b1b85..51fd4e6654c 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -681,10 +681,15 @@ private: if (PrevToken->FormatTok.Tok.isLiteral() || PrevToken->isOneOf(tok::r_paren, tok::r_square) || - NextToken->FormatTok.Tok.isLiteral() || isUnaryOperator(*NextToken) || - NextToken->isOneOf(tok::l_paren, tok::l_square)) + 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) @@ -989,7 +994,8 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, !Style.PointerBindsToType); if (Left.Type == TT_PointerOrReference) return Right.FormatTok.Tok.isLiteral() || - ((Right.Type != TT_PointerOrReference) && Style.PointerBindsToType); + ((Right.Type != TT_PointerOrReference) && + Right.isNot(tok::l_paren) && Style.PointerBindsToType); if (Right.is(tok::star) && Left.is(tok::l_paren)) return false; if (Left.is(tok::l_square)) |
