diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-21 21:33:55 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-21 21:33:55 +0000 |
| commit | 12ef4e59effbad1f76bbe0b5011d45e777436b4c (patch) | |
| tree | e86378ae023a8ad4d722d14e76af38fa5f044e7f /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 699cf390ff1e621a1fa78dd5b3e90cf6d2c10299 (diff) | |
| download | bcm5719-llvm-12ef4e59effbad1f76bbe0b5011d45e777436b4c.tar.gz bcm5719-llvm-12ef4e59effbad1f76bbe0b5011d45e777436b4c.zip | |
Consistently put {} onto the same line for empty functions.
This fixes llvm.org/PR15167.
Before:
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL()
: AAAAAAAA(10), BBBBBBBBB(10) {
}
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL() : AAAAAAAA(10) {}
After:
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL()
: AAAAAAAA(10), BBBBBBBBB(10) {}
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL() : AAAAAAAA(10) {}
llvm-svn: 175800
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index dcbdb786fae..af59a18e96b 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -517,8 +517,7 @@ private: : BindingStrength(BindingStrength), LongestObjCSelectorName(0), ColonIsForRangeExpr(false), ColonIsObjCMethodExpr(false), FirstObjCSelectorName(NULL), IsExpression(IsExpression), - LookForFunctionName(false) { - } + LookForFunctionName(false) {} unsigned BindingStrength; unsigned LongestObjCSelectorName; @@ -1104,6 +1103,7 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, Right.is(tok::arrow) || Right.is(tok::period) || Right.is(tok::colon) || Left.is(tok::coloncolon) || Left.is(tok::semi) || Left.is(tok::l_brace) || + Right.is(tok::r_brace) || (Left.is(tok::r_paren) && Left.Type != TT_CastRParen && Right.is(tok::identifier)) || (Left.is(tok::l_paren) && !Right.is(tok::r_paren)) || |
