Hi, I personally find the first style much easier to skim/scan -- which is when this kind of thing matters -- and indeed only write something like the first if I'm forced to by a language where the computer uses hanging constructs to detect a continuation line, which isn't the case for the C++ used in LLVM . So one vote for the first style in LLVM.
On Fri, Jan 10, 2014 at 9:41 AM, Daniel Jasper <[email protected]> wrote: > > > > On Fri, Jan 10, 2014 at 10:07 AM, Chandler Carruth <[email protected]> > wrote: >> >> On Fri, Jan 10, 2014 at 12:40 AM, Daniel Jasper <[email protected]> >> wrote: >>> >>> Author: djasper >>> Date: Fri Jan 10 02:40:17 2014 >>> New Revision: 198924 >>> >>> URL: http://llvm.org/viewvc/llvm-project?rev=198924&view=rev >>> Log: >>> clang-format: Slightly adapt line break in edge case. >>> >>> Before: >>> SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)] >>> .insert(ccccccccccccccccccccccc); >>> >>> After: >>> SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)].insert( >>> ccccccccccccccccccccccc); >>> >>> This seems to be about 3:1 more common in Google and Chromium style and I >>> found >>> only a handful of instances inside the LLVM codebase. >> >> >> Without any significant numbers in the LLVM codebase, I would prefer >> LLVM's style stick to the first -- I think its significantly easier to read >> personally. I'd also be interested in others' opinions since we don't really >> have numbers here. > > > Thanks for the additional input. There are less than 10 instances of either > choice in the LLVM codebase providing a bad signal-to-noise ratio. This > might mean that it doesn't matter much, but I am happy to switch this back > for LLVM style if there is a general preference. > >>> >>> 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=198924&r1=198923&r2=198924&view=diff >>> >>> ============================================================================== >>> --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original) >>> +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Fri Jan 10 02:40:17 2014 >>> @@ -1203,7 +1203,7 @@ unsigned TokenAnnotator::splitPenalty(co >>> return 2; >>> >>> if (Right.isMemberAccess()) { >>> - if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen >>> && >>> + if (Left.is(tok::r_paren) && Left.MatchingParen && >>> Left.MatchingParen->ParameterCount > 0) >>> return 20; // Should be smaller than breaking at a nested comma. >>> return 150; >>> >>> Modified: cfe/trunk/unittests/Format/FormatTest.cpp >>> URL: >>> http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=198924&r1=198923&r2=198924&view=diff >>> >>> ============================================================================== >>> --- cfe/trunk/unittests/Format/FormatTest.cpp (original) >>> +++ cfe/trunk/unittests/Format/FormatTest.cpp Fri Jan 10 02:40:17 2014 >>> @@ -3910,8 +3910,8 @@ TEST_F(FormatTest, WrapsAtFunctionCallsI >>> >>> verifyFormat("EXPECT_CALL(SomeObject, SomeFunction(Parameter))\n" >>> " .WillRepeatedly(Return(SomeValue));"); >>> - verifyFormat("SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)]\n" >>> - " .insert(ccccccccccccccccccccccc);"); >>> + verifyFormat("SomeMap[std::pair(aaaaaaaaaaaa, >>> bbbbbbbbbbbbbbb)].insert(\n" >>> + " ccccccccccccccccccccccc);"); >>> verifyFormat("aaaaa(aaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" >>> " >>> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa).aaaaa(aaaaa),\n" >>> " aaaaaaaaaaaaaaaaaaaaa);"); >>> >>> >>> _______________________________________________ >>> 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 > -- cheers, dave tweed__________________________ high-performance computing and machine vision expert: [email protected] "while having code so boring anyone can maintain it, use Python." -- attempted insult seen on slashdot _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
