<br><br><div>On Fri Jan 10 2014 at 1:43:37 AM, Daniel Jasper <<a href="mailto:djasper@google.com">djasper@google.com</a>> wrote:</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr"><div><div>On Fri, Jan 10, 2014 at 10:07 AM, Chandler Carruth <span dir="ltr"><<a href="mailto:chandlerc@google.com" target="_blank">chandlerc@google.com</a>></span> wrote:<br>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><div><div>On Fri, Jan 10, 2014 at 12:40 AM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Fri Jan 10 02:40:17 2014<br>
New Revision: 198924<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=198924&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=198924&view=rev</a><br>
Log:<br>
clang-format: Slightly adapt line break in edge case.<br>
<br>
Before:<br>
SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)]<br>
.insert(ccccccccccccccccccccccc);<br>
<br>
After:<br>
SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)].insert(<br>
ccccccccccccccccccccccc);<br>
<br>
This seems to be about 3:1 more common in Google and Chromium style and I found<br>
only a handful of instances inside the LLVM codebase.<br></blockquote><div><br></div></div><div>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.</div>
</div></div></div></blockquote><div><br></div></div></div></div><div dir="ltr"><div><div><div>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.</div>
</div></div></div><div dir="ltr"><div><div>
<div><br></div></div></div></div></blockquote><div><br></div><div>Please. The second is much harder to read/scan and is a common pattern (largely without long lines I guess) in the backend.</div><div><br></div><div>-eric</div>
<div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><div><div></div><blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr"><div><div><div><blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
cfe/trunk/lib/Format/TokenAnnotator.cpp<br>
cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=198924&r1=198923&r2=198924&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=198924&r1=198923&r2=198924&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Fri Jan 10 02:40:17 2014<br>
@@ -1203,7 +1203,7 @@ unsigned TokenAnnotator::splitPenalty(co<br>
return 2;<br>
<br>
if (Right.isMemberAccess()) {<br>
- if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen &&<br>
+ if (Left.is(tok::r_paren) && Left.MatchingParen &&<br>
Left.MatchingParen->ParameterCount > 0)<br>
return 20; // Should be smaller than breaking at a nested comma.<br>
return 150;<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=198924&r1=198923&r2=198924&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=198924&r1=198923&r2=198924&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Fri Jan 10 02:40:17 2014<br>
@@ -3910,8 +3910,8 @@ TEST_F(FormatTest, WrapsAtFunctionCallsI<br>
<br>
verifyFormat("EXPECT_CALL(SomeObject, SomeFunction(Parameter))\n"<br>
" .WillRepeatedly(Return(SomeValue));");<br>
- verifyFormat("SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)]\n"<br>
- " .insert(ccccccccccccccccccccccc);");<br>
+ verifyFormat("SomeMap[std::pair(aaaaaaaaaaaa, bbbbbbbbbbbbbbb)].insert(\n"<br>
+ " ccccccccccccccccccccccc);");<br>
verifyFormat("aaaaa(aaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa).aaaaa(aaaaa),\n"<br>
" aaaaaaaaaaaaaaaaaaaaa);");<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div><br></div></div>
</blockquote></div></div></div></blockquote>