<div dir="ltr">On Wed, Mar 13, 2013 at 8:37 AM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Wed Mar 13 10:37:48 2013<br>
New Revision: 176952<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=176952&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=176952&view=rev</a><br>
Log:<br>
Fix formatting issue with builder-type calls.<br>
<br>
Before:<br>
->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() - aaaaaaaaa()->aaaaaa()<br>
                                                             ->aaaaa());<br>
<br>
After:<br>
a->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() -<br>
                         aaaaaaaaa()->aaaaaa()->aaaaa());<br>
<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=176952&r1=176951&r2=176952&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=176952&r1=176951&r2=176952&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Wed Mar 13 10:37:48 2013<br>
@@ -894,7 +894,7 @@ unsigned TokenAnnotator::splitPenalty(co<br>
<br>
   if (Right.isOneOf(tok::arrow, tok::period)) {<br>
     if (Line.Type == LT_BuilderTypeCall)<br>
-      return 5;<br>
+      return 14;<br></blockquote><div><br></div><div style>Has 14 any significance against 15? If yes, please add comment :)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

     if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen &&<br>
         Left.MatchingParen->ParameterCount > 0)<br>
       return 20; // Should be smaller than breaking at a nested comma.<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=176952&r1=176951&r2=176952&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=176952&r1=176951&r2=176952&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Wed Mar 13 10:37:48 2013<br>
@@ -1664,6 +1664,10 @@ TEST_F(FormatTest, WrapsAtFunctionCallsI<br>
   verifyFormat(<br>
       "aaaaaaaaaaaaaaaaaaaaaaaaa(\n"<br>
       "    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa().aaaaaaaaaaaaaaaaa());");<br>
+  verifyFormat("a->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() *\n"<br>
+               "                         aaaaaaaaa()->aaaaaa()->aaaaa());");<br>
+  verifyFormat("a->aaaaaa()->aaaaaaaaaaa(aaaaaaaa()->aaaaaa()->aaaaa() ||\n"<br>
+               "                         aaaaaaaaa()->aaaaaa()->aaaaa());");<br>
<br>
   FormatStyle NoBinPacking = getLLVMStyle();<br>
   NoBinPacking.BinPackParameters = false;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">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><br></div></div>