I agree, I did not immediately attempt a fix as I first wanted to ask about the other space (the one between ^ and Block1). Do we want to keep that as well or did you just add that because it was the current state of clang-format?
Cheers, Daniel On Fri, Dec 21, 2012 at 6:09 PM, jahanian <[email protected]> wrote: > Looks like block with initializer adds extra space between '(' and '^' > while block without initializer does not. > I think we want to be consistent. Essentially, block formatting should > follow that of > function pointer formatting. > > > - Fariborz > > On Dec 21, 2012, at 4:10 AM, Daniel Jasper <[email protected]> wrote: > > > Author: djasper > > Date: Fri Dec 21 06:10:20 2012 > > New Revision: 170887 > > > > URL: http://llvm.org/viewvc/llvm-project?rev=170887&view=rev > > Log: > > Temporary fix of tests to make buildbots happy. > > > > Permanent solution coming up after checking back with Fariborz/Douglas. > > > > Modified: > > cfe/trunk/test/Index/comment-c-decls.c > > cfe/trunk/test/Index/comment-to-html-xml-conversion.cpp > > cfe/trunk/test/Index/format-comment-cdecls.c > > > > Modified: cfe/trunk/test/Index/comment-c-decls.c > > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/comment-c-decls.c?rev=170887&r1=170886&r2=170887&view=diff > > > ============================================================================== > > --- cfe/trunk/test/Index/comment-c-decls.c (original) > > +++ cfe/trunk/test/Index/comment-c-decls.c Fri Dec 21 06:10:20 2012 > > @@ -101,4 +101,4 @@ > > *\brief block declaration > > */ > > int (^Block1) (int i, int j) = ^(int i, int j) { return i + j; }; > > -// CHECK: <Declaration>int (^ Block1) (int, int) = ^ (int i, int j) > {\n}</Declaration> > > +// CHECK: <Declaration>int ( ^ Block1) (int, int) = ^ (int i, int j) > {\n}</Declaration> > > > > Modified: cfe/trunk/test/Index/comment-to-html-xml-conversion.cpp > > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/comment-to-html-xml-conversion.cpp?rev=170887&r1=170886&r2=170887&view=diff > > > ============================================================================== > > --- cfe/trunk/test/Index/comment-to-html-xml-conversion.cpp (original) > > +++ cfe/trunk/test/Index/comment-to-html-xml-conversion.cpp Fri Dec 21 > 06:10:20 2012 > > @@ -670,7 +670,7 @@ > > template<typename T, typename U> > > class comment_to_xml_conversion_11 { }; > > > > -// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:7: > ClassTemplate=comment_to_xml_conversion_11:{{.*}} FullCommentAsXML=[<Class > templateKind="template" file="{{[^"]+}}comment-to-html-xml-conversion.cpp" > line="[[@LINE-2]]" > column="7"><Name>comment_to_xml_conversion_11</Name><USR>c:@CT > >2#T#T@comment_to_xml_conversion_11</USR><Declaration>template > <typename T = int,\n typename U = int> class > comment_to_xml_conversion_11 {\n}\ntemplate <typename T, typename U> > class comment_to_xml_conversion_11 {\n}</Declaration><Abstract><Para> > Aaa.</Para></Abstract></Class>] > > +// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:7: > ClassTemplate=comment_to_xml_conversion_11:{{.*}} FullCommentAsXML=[<Class > templateKind="template" file="{{[^"]+}}comment-to-html-xml-conversion.cpp" > line="[[@LINE-2]]" > column="7"><Name>comment_to_xml_conversion_11</Name><USR>c:@CT > >2#T#T@comment_to_xml_conversion_11</USR><Declaration>template > <typename T = int, typename U = int>\n class > comment_to_xml_conversion_11 {\n}\ntemplate <typename T, typename U> > class comment_to_xml_conversion_11 {\n}</Declaration><Abstract><Para> > Aaa.</Para></Abstract></Class>] > > > > /// Aaa. > > template<typename T> > > > > Modified: cfe/trunk/test/Index/format-comment-cdecls.c > > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/format-comment-cdecls.c?rev=170887&r1=170886&r2=170887&view=diff > > > ============================================================================== > > --- cfe/trunk/test/Index/format-comment-cdecls.c (original) > > +++ cfe/trunk/test/Index/format-comment-cdecls.c Fri Dec 21 06:10:20 2012 > > @@ -96,4 +96,4 @@ > > *\brief block declaration > > */ > > int (^Block1) (int i, int j) = ^(int i, int j) { return i + j; }; > > -// CHECK: <Declaration>int (^ Block1) (int, int) = ^ (int i, int j) > {\n}</Declaration> > > +// CHECK: <Declaration>int ( ^ Block1) (int, int) = ^ (int i, int j) > {\n}</Declaration> > > > > > > _______________________________________________ > > cfe-commits mailing list > > [email protected] > > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits > >
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
