<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Oct 26, 2015 at 9:21 PM, 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:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr">I mixed up before and after. Other than that, I don't see a typo.</div></blockquote><div><br>It looks like the test case "<span style="color:rgb(80,0,80)">+ verifyFormat("std::function< void(int, int) > fct;", Spaces);" ensures no spaces between the parameters and the () in the function type ("void(int, int)") but the commit message says "void( int, int )" -> "void( int, int)", neither of which is what the test case tests, right?</span><br> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div class=""><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Oct 26, 2015 at 5:44 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><span>On Mon, Oct 26, 2015 at 5:08 AM, Daniel Jasper via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: djasper<br>
Date: Mon Oct 26 07:08:47 2015<br>
New Revision: 251284<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=251284&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=251284&view=rev</a><br>
Log:<br>
clang-format: Fix false positive in cast detection.<br>
<br>
Before (with spaces in parentheses):<br>
void inFunction() { std::function<void( int, int )> fct; }<br>
<br>
After:<br>
void inFunction() { std::function<void( int, int)> fct; }<br></blockquote><div><br></div></span><div>I take it the typo in ^ between the "(" and the "int" is just a typo in the commit message, not reflected in the actual behavior? (judging by the test that seems to be the case)</div><div><div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style: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=251284&r1=251283&r2=251284&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=251284&r1=251283&r2=251284&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Mon Oct 26 07:08:47 2015<br>
@@ -1086,7 +1086,8 @@ private:<br>
Tok.Previous->isOneOf(TT_PointerOrReference, TT_TemplateCloser) ||<br>
Tok.Previous->isSimpleTypeSpecifier();<br>
bool ParensCouldEndDecl =<br>
- Tok.Next && Tok.Next->isOneOf(tok::equal, tok::semi, tok::l_brace);<br>
+ Tok.Next &&<br>
+ Tok.Next->isOneOf(tok::equal, tok::semi, tok::l_brace, tok::greater);<br>
bool IsSizeOfOrAlignOf =<br>
LeftOfParens && LeftOfParens->isOneOf(tok::kw_sizeof, tok::kw_alignof);<br>
if (ParensAreType && !ParensCouldEndDecl && !IsSizeOfOrAlignOf &&<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=251284&r1=251283&r2=251284&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=251284&r1=251283&r2=251284&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Mon Oct 26 07:08:47 2015<br>
@@ -8398,6 +8398,8 @@ TEST_F(FormatTest, ConfigurableSpacesInP<br>
verifyFormat("call( x, y, z );", Spaces);<br>
verifyFormat("call();", Spaces);<br>
verifyFormat("std::function<void( int, int )> callback;", Spaces);<br>
+ verifyFormat("void inFunction() { std::function<void( int, int )> fct; }",<br>
+ Spaces);<br>
verifyFormat("while ( (bool)1 )\n"<br>
" continue;",<br>
Spaces);<br>
@@ -10633,6 +10635,9 @@ TEST_F(FormatTest, SpacesInAngles) {<br>
verifyFormat("f< int, float >();", Spaces);<br>
verifyFormat("template <> g() {}", Spaces);<br>
verifyFormat("template < std::vector< int > > f() {}", Spaces);<br>
+ verifyFormat("std::function< void(int, int) > fct;", Spaces);<br>
+ verifyFormat("void inFunction() { std::function< void(int, int) > fct; }",<br>
+ Spaces);<br>
<br>
Spaces.Standard = FormatStyle::LS_Cpp03;<br>
Spaces.SpacesInAngles = true;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div></div>