<div dir="ltr">On Thu, Mar 14, 2013 at 7:00 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: Thu Mar 14 09:00:17 2013<br>
New Revision: 177075<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=177075&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=177075&view=rev</a><br>
Log:<br>
Slightly improve formatting of longer pipe statements.<br>
<br>
The stronger binding of a string ending in :/= does not really make<br>
sense if it is the only character.<br>
<br>
Before:<br>
llvm::outs() << aaaaaaaaaaaaaaaaaaaaaaaa<br>
             << "=" << bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;<br>
<br>
After:<br>
llvm::outs() << aaaaaaaaaaaaaaaaaaaaaaaa << "="<br>
             << bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;<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=177075&r1=177074&r2=177075&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=177075&r1=177074&r2=177075&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Thu Mar 14 09:00:17 2013<br>
@@ -934,10 +934,11 @@ unsigned TokenAnnotator::splitPenalty(co<br>
<br>
   if (Right.is(tok::lessless)) {<br>
     if (Left.is(tok::string_literal)) {<br>
-      char LastChar =<br>
-          StringRef(Left.FormatTok.Tok.getLiteralData(),<br>
-                    Left.FormatTok.TokenLength).drop_back(1).rtrim().back();<br>
-      if (LastChar == ':' || LastChar == '=')<br>
+      StringRef Content = StringRef(Left.FormatTok.Tok.getLiteralData(),<br>
+                                    Left.FormatTok.TokenLength);<br>
+      Content = Content.drop_back(1).drop_front(1).trim();<br>
+      if (Content.size() > 1 &&<br>
+          (Content.back() == ':' || Content.back() == '='))<br></blockquote><div><br></div><div style>At some point we'll want to add tests for non-narrow and raw string literals, in which case Content[0] doesn't have to be '"'.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
         return 100;<br>
     }<br>
     return prec::Shift;<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=177075&r1=177074&r2=177075&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=177075&r1=177074&r2=177075&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Thu Mar 14 09:00:17 2013<br>
@@ -1628,6 +1628,8 @@ TEST_F(FormatTest, AlignsPipes) {<br>
       "             << \"ccccccccccccccccc = \" << ccccccccccccccccc\n"<br>
       "             << \"ddddddddddddddddd = \" << ddddddddddddddddd\n"<br>
       "             << \"eeeeeeeeeeeeeeeee = \" << eeeeeeeeeeeeeeeee;");<br>
+  verifyFormat("llvm::outs() << aaaaaaaaaaaaaaaaaaaaaaaa << \"=\"\n"<br>
+               "             << bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;");<br>
 }<br>
<br>
 TEST_F(FormatTest, UnderstandsEquals) {<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>