<div dir="ltr">Yay! Thanks.<div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 19, 2015 at 5:29 AM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Tue May 19 07:29:27 2015<br>
New Revision: 237690<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=237690&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=237690&view=rev</a><br>
Log:<br>
clang-format: Improve *-detection.<br>
<br>
Before:<br>
  S << a *(10);<br>
<br>
After:<br>
  S << a * (10);<br>
<br>
This fixes <a href="http://llvm.org/PR16500" target="_blank">llvm.org/PR16500</a>.<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=237690&r1=237689&r2=237690&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=237690&r1=237689&r2=237690&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Tue May 19 07:29:27 2015<br>
@@ -825,6 +825,9 @@ private:<br>
             Previous->Type = TT_PointerOrReference;<br>
         }<br>
       }<br>
+    } else if (Current.is(tok::lessless) &&<br>
+               (!Current.Previous || !Current.Previous->is(tok::kw_operator))) {<br>
+      Contexts.back().IsExpression = true;<br>
     } else if (Current.isOneOf(tok::kw_return, tok::kw_throw)) {<br>
       Contexts.back().IsExpression = true;<br>
     } else if (Current.is(TT_TrailingReturnArrow)) {<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=237690&r1=237689&r2=237690&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=237690&r1=237689&r2=237690&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Tue May 19 07:29:27 2015<br>
@@ -5468,6 +5468,8 @@ TEST_F(FormatTest, UnderstandsUsesOfStar<br>
   verifyIndependentOfContext("int a = *b;");<br>
   verifyIndependentOfContext("int a = *b * c;");<br>
   verifyIndependentOfContext("int a = b * *c;");<br>
+  verifyIndependentOfContext("int a = b * (10);");<br>
+  verifyIndependentOfContext("S << b * (10);");<br>
   verifyIndependentOfContext("return 10 * b;");<br>
   verifyIndependentOfContext("return *b * *c;");<br>
   verifyIndependentOfContext("return a & ~b;");<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>