14 is the precedence of the PointerToMember operator, which should be equal to this in my opinion. Will change to just return prec::PointerToMember in next commit.
On Wed, Mar 13, 2013 at 5:05 PM, Manuel Klimek <[email protected]> wrote: > On Wed, Mar 13, 2013 at 8:37 AM, Daniel Jasper <[email protected]> wrote: > >> Author: djasper >> Date: Wed Mar 13 10:37:48 2013 >> New Revision: 176952 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=176952&view=rev >> Log: >> Fix formatting issue with builder-type calls. >> >> Before: >> ->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() - >> aaaaaaaaa()->aaaaaa() >> ->aaaaa()); >> >> After: >> a->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() - >> aaaaaaaaa()->aaaaaa()->aaaaa()); >> >> Modified: >> cfe/trunk/lib/Format/TokenAnnotator.cpp >> cfe/trunk/unittests/Format/FormatTest.cpp >> >> Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=176952&r1=176951&r2=176952&view=diff >> >> ============================================================================== >> --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original) >> +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Wed Mar 13 10:37:48 2013 >> @@ -894,7 +894,7 @@ unsigned TokenAnnotator::splitPenalty(co >> >> if (Right.isOneOf(tok::arrow, tok::period)) { >> if (Line.Type == LT_BuilderTypeCall) >> - return 5; >> + return 14; >> > > Has 14 any significance against 15? If yes, please add comment :) > > >> if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen >> && >> Left.MatchingParen->ParameterCount > 0) >> return 20; // Should be smaller than breaking at a nested comma. >> >> Modified: cfe/trunk/unittests/Format/FormatTest.cpp >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=176952&r1=176951&r2=176952&view=diff >> >> ============================================================================== >> --- cfe/trunk/unittests/Format/FormatTest.cpp (original) >> +++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Mar 13 10:37:48 2013 >> @@ -1664,6 +1664,10 @@ TEST_F(FormatTest, WrapsAtFunctionCallsI >> verifyFormat( >> "aaaaaaaaaaaaaaaaaaaaaaaaa(\n" >> " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa().aaaaaaaaaaaaaaaaa());"); >> + verifyFormat("a->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() >> *\n" >> + " >> aaaaaaaaa()->aaaaaa()->aaaaa());"); >> + verifyFormat("a->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() >> ||\n" >> + " >> aaaaaaaaa()->aaaaaa()->aaaaa());"); >> >> FormatStyle NoBinPacking = getLLVMStyle(); >> NoBinPacking.BinPackParameters = false; >> >> >> _______________________________________________ >> cfe-commits mailing list >> [email protected] >> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits >> > >
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
