<div dir="ltr">The description "Improve formatting of arrays of pointers and function types" would have been more accurate ..</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Mar 1, 2013 at 6:13 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:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Fri Mar 1 11:13:29 2013<br>
New Revision: 176356<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=176356&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=176356&view=rev</a><br>
Log:<br>
Correctly format arrays of pointers and function types.<br>
<br>
Before:<br>
void f(Type(*parameter)[10]) {}<br>
int(*func)(void *);<br>
<br>
After:<br>
void f(Type (*parameter)[10]) {}<br>
int (*func)(void *);<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=176356&r1=176355&r2=176356&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=176356&r1=176355&r2=176356&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/TokenAnnotator.cpp (original)<br>
+++ cfe/trunk/lib/Format/TokenAnnotator.cpp Fri Mar 1 11:13:29 2013<br>
@@ -645,6 +645,9 @@ private:<br>
if (NextToken == NULL)<br>
return TT_Unknown;<br>
<br>
+ if (PrevToken->is(tok::l_paren) && !IsExpression)<br>
+ return TT_PointerOrReference;<br>
+<br>
if (PrevToken->is(tok::l_paren) || PrevToken->is(tok::l_square) ||<br>
PrevToken->is(tok::l_brace) || PrevToken->is(tok::comma) ||<br>
PrevToken->is(tok::kw_return) || PrevToken->is(tok::colon) ||<br>
@@ -1041,6 +1044,11 @@ bool TokenAnnotator::spaceRequiredBefore<br>
if (Tok.is(tok::colon))<br>
return Line.First.isNot(tok::kw_case) && !Tok.Children.empty() &&<br>
Tok.Type != TT_ObjCMethodExpr;<br>
+ if (Tok.is(tok::l_paren) && !Tok.Children.empty() &&<br>
+ Tok.Children[0].Type == TT_PointerOrReference &&<br>
+ !Tok.Children[0].Children.empty() &&<br>
+ Tok.Children[0].Children[0].isNot(tok::r_paren))<br>
+ return true;<br>
if (Tok.Parent->Type == TT_UnaryOperator || Tok.Parent->Type == TT_CastRParen)<br>
return false;<br>
if (Tok.Type == TT_UnaryOperator)<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=176356&r1=176355&r2=176356&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=176356&r1=176355&r2=176356&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Fri Mar 1 11:13:29 2013<br>
@@ -1812,7 +1812,7 @@ TEST_F(FormatTest, UnderstandsUsesOfStar<br>
verifyFormat("int main(int argc, char **argv) {}");<br>
verifyFormat("Test::Test(int b) : a(b * b) {}");<br>
verifyIndependentOfContext("f(a, *a);");<br>
- verifyIndependentOfContext("f(*a);");<br>
+ verifyFormat("void g() { f(*a); }");<br>
verifyIndependentOfContext("int a = b * 10;");<br>
verifyIndependentOfContext("int a = 10 * b;");<br>
verifyIndependentOfContext("int a = b * c;");<br>
@@ -1845,6 +1845,7 @@ TEST_F(FormatTest, UnderstandsUsesOfStar<br>
verifyIndependentOfContext("return sizeof(int **);");<br>
verifyIndependentOfContext("return sizeof(int ******);");<br>
verifyIndependentOfContext("return (int **&)a;");<br>
+ verifyFormat("void f(Type (*parameter)[10]) {}");<br>
verifyGoogleFormat("return sizeof(int**);");<br>
verifyIndependentOfContext("Type **A = static_cast<Type **>(P);");<br>
verifyGoogleFormat("Type** A = static_cast<Type**>(P);");<br>
@@ -1884,7 +1885,7 @@ TEST_F(FormatTest, UnderstandsUsesOfStar<br>
verifyIndependentOfContext("a = &(x + y);");<br>
verifyIndependentOfContext("*(x + y).call();");<br>
verifyIndependentOfContext("&(x + y)->call();");<br>
- verifyIndependentOfContext("&(*I).first");<br>
+ verifyFormat("void f() { &(*I).first; }");<br>
<br>
verifyIndependentOfContext("f(b * /* confusing comment */ ++c);");<br>
verifyFormat(<br>
@@ -1909,7 +1910,9 @@ TEST_F(FormatTest, UnderstandsUsesOfStar<br>
<br>
verifyIndependentOfContext("A = new SomeType *[Length]();");<br>
verifyGoogleFormat("A = new SomeType* [Length]();");<br>
+}<br>
<br>
+TEST_F(FormatTest, AdaptivelyFormatsPointersAndReferences) {<br>
EXPECT_EQ("int *a;\n"<br>
"int *a;\n"<br>
"int *a;",<br>
@@ -1977,12 +1980,13 @@ TEST_F(FormatTest, FormatsCasts) {<br>
}<br>
<br>
TEST_F(FormatTest, FormatsFunctionTypes) {<br>
- // FIXME: Determine the cases that need a space after the return type and fix.<br>
verifyFormat("A<bool()> a;");<br>
verifyFormat("A<SomeType()> a;");<br>
verifyFormat("A<void(*)(int, std::string)> a;");<br>
<br>
- verifyFormat("int(*func)(void *);");<br>
+ // FIXME: Inconsistent.<br>
+ verifyFormat("int (*func)(void *);");<br>
+ verifyFormat("void f() { int(*func)(void *); }");<br>
}<br>
<br>
TEST_F(FormatTest, BreaksLongDeclarations) {<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>