[cfe-commits] r166130 - in /cfe/trunk: bindings/xml/comment-xml-schema.rng include/clang/AST/Comment.h include/clang/AST/PrettyPrinter.h lib/AST/Comment.cpp lib/AST/DeclPrinter.cpp test/Index/annotate-comments-availability-attrs.cpp test/Index/an

[jahanian]

On Oct 17, 2012, at 4:00 PM, David Blaikie <dblaikie at gmail.com> wrote:

> On Wed, Oct 17, 2012 at 2:58 PM, Fariborz Jahanian <fjahanian at apple.com> wrote:
>> Author: fjahanian
>> Date: Wed Oct 17 16:58:03 2012
>> New Revision: 166130
>> 
>> URL: http://llvm.org/viewvc/llvm-project?rev=166130&view=rev
>> Log:
>> [Doc parsing]: This patch adds <Declaration> tag to
>> XML comment for declarations which pretty-prints
>> declaration. I had to XFAIL one test annotate-comments.cpp.
>> This test is currently unmaintainable as written.
>> Dmitri G., can you see what we can do about this test.
>> We should change this test such that adding a new tag does not wreck
>> havoc to the test.
>> 
>> Modified:
>>    cfe/trunk/bindings/xml/comment-xml-schema.rng
>>    cfe/trunk/include/clang/AST/Comment.h
>>    cfe/trunk/include/clang/AST/PrettyPrinter.h
>>    cfe/trunk/lib/AST/Comment.cpp
>>    cfe/trunk/lib/AST/DeclPrinter.cpp
>>    cfe/trunk/test/Index/annotate-comments-availability-attrs.cpp
>>    cfe/trunk/test/Index/annotate-comments.cpp
>>    cfe/trunk/test/Index/overriding-ftemplate-comments.cpp
>>    cfe/trunk/test/Index/overriding-method-comments.mm
> 
> I'm seeing failures on annotate-comments-availability-attrs.cpp,
> overriding-ftemplate-comments.cpp, and overriding-methods-comments.mm.
> Roughly like this:
> 
> llvm/src/tools/clang/test/Index/overriding-ftemplate-comments.cpp:60:11:
> error: expected string not found in input
> // CHECK: FullCommentAsXML=[<Function templateKind="template"
> file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="14"
> column="6"><Name>comment_to_html_conversion_17</Name><USR>c:@FT@>1#Tcomment_to_html_conversion_17#t0.0#</USR><Declaration>template
> <typename T> void comment_to_html_conversion_17(T
> AAA)</Declaration><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
> isExplicit="0">in</Direction><Discussion><Para> Blah
> blah</Para></Discussion></Parameter></Parameters></Function>]
> CommentXMLValid
>          ^
> <stdin>:1:1: note: scanning from here
> // CHECK: <invalid loc>:2:9: macro definition=__llvm__
> ^
> 
> The complete output file of that test is attached for reference.

Since this may take a while, I have XFAIL'ed them until I can figure it out.
In r166151.
- fariborz