Skip to content

Commit 7da378b

Browse files
committed
Fix comment to XML tests
1 parent 49fd778 commit 7da378b

File tree

1 file changed

+21
-32
lines changed

1 file changed

+21
-32
lines changed

clang/test/Index/comment-to-html-xml-conversion.cpp

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,82 +1046,71 @@ void comment_to_xml_conversion_todo_4();
10461046
/// Aaa.
10471047
/// \throws Bbb.
10481048
void comment_to_xml_conversion_exceptions_1();
1049-
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_1:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_1</Name><USR>c:@F@comment_to_xml_conversion_exceptions_1#</USR><Declaration>void comment_to_xml_conversion_exceptions_1()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions><Para> Bbb.</Para></Exceptions></Function>]
1049+
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_1:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_1</Name><USR>c:@F@comment_to_xml_conversion_exceptions_1#</USR><Declaration>void comment_to_xml_conversion_exceptions_1()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions></Exceptions></Function>]
10501050
// CHECK-NEXT: CommentAST=[
10511051
// CHECK-NEXT: (CXComment_FullComment
10521052
// CHECK-NEXT: (CXComment_Paragraph
10531053
// CHECK-NEXT: (CXComment_Text Text=[ Aaa.] HasTrailingNewline)
10541054
// CHECK-NEXT: (CXComment_Text Text=[ ] IsWhitespace))
1055-
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws]
1056-
// CHECK-NEXT: (CXComment_Paragraph
1057-
// CHECK-NEXT: (CXComment_Text Text=[ Bbb.]))))]
1055+
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws] Arg[0]=Bbb.
1056+
// CHECK-NEXT: (CXComment_Paragraph IsWhitespace)))]
10581057

10591058
/// Aaa.
10601059
/// \throw Bbb.
10611060
void comment_to_xml_conversion_exceptions_2();
1062-
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_2:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_2</Name><USR>c:@F@comment_to_xml_conversion_exceptions_2#</USR><Declaration>void comment_to_xml_conversion_exceptions_2()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions><Para> Bbb.</Para></Exceptions></Function>]
1061+
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_2:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_2</Name><USR>c:@F@comment_to_xml_conversion_exceptions_2#</USR><Declaration>void comment_to_xml_conversion_exceptions_2()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions></Exceptions></Function>]
10631062
// CHECK-NEXT: CommentAST=[
10641063
// CHECK-NEXT: (CXComment_FullComment
10651064
// CHECK-NEXT: (CXComment_Paragraph
10661065
// CHECK-NEXT: (CXComment_Text Text=[ Aaa.] HasTrailingNewline)
10671066
// CHECK-NEXT: (CXComment_Text Text=[ ] IsWhitespace))
1068-
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throw]
1069-
// CHECK-NEXT: (CXComment_Paragraph
1070-
// CHECK-NEXT: (CXComment_Text Text=[ Bbb.]))))]
1067+
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throw] Arg[0]=Bbb.
1068+
// CHECK-NEXT: (CXComment_Paragraph IsWhitespace)))]
10711069

10721070
/// Aaa.
10731071
/// \exception Bbb.
10741072
void comment_to_xml_conversion_exceptions_3();
1075-
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_3:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_3</Name><USR>c:@F@comment_to_xml_conversion_exceptions_3#</USR><Declaration>void comment_to_xml_conversion_exceptions_3()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions><Para> Bbb.</Para></Exceptions></Function>]
1073+
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_3:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_3</Name><USR>c:@F@comment_to_xml_conversion_exceptions_3#</USR><Declaration>void comment_to_xml_conversion_exceptions_3()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions></Exceptions></Function>]
10761074
// CHECK-NEXT: CommentAST=[
10771075
// CHECK-NEXT: (CXComment_FullComment
10781076
// CHECK-NEXT: (CXComment_Paragraph
10791077
// CHECK-NEXT: (CXComment_Text Text=[ Aaa.] HasTrailingNewline)
10801078
// CHECK-NEXT: (CXComment_Text Text=[ ] IsWhitespace))
1081-
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[exception]
1082-
// CHECK-NEXT: (CXComment_Paragraph
1083-
// CHECK-NEXT: (CXComment_Text Text=[ Bbb.]))))]
1079+
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[exception] Arg[0]=Bbb.
1080+
// CHECK-NEXT: (CXComment_Paragraph IsWhitespace)))]
10841081

10851082
/// Aaa.
10861083
/// \throws Bbb.
10871084
/// \throws Ccc.
10881085
/// \throws Ddd.
10891086
void comment_to_xml_conversion_exceptions_4();
1090-
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_4:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_4</Name><USR>c:@F@comment_to_xml_conversion_exceptions_4#</USR><Declaration>void comment_to_xml_conversion_exceptions_4()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions><Para> Bbb. </Para><Para> Ccc. </Para><Para> Ddd.</Para></Exceptions></Function>]
1087+
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_4:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_4</Name><USR>c:@F@comment_to_xml_conversion_exceptions_4#</USR><Declaration>void comment_to_xml_conversion_exceptions_4()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions></Exceptions></Function>]
10911088
// CHECK-NEXT: CommentAST=[
10921089
// CHECK-NEXT: (CXComment_FullComment
10931090
// CHECK-NEXT: (CXComment_Paragraph
10941091
// CHECK-NEXT: (CXComment_Text Text=[ Aaa.] HasTrailingNewline)
10951092
// CHECK-NEXT: (CXComment_Text Text=[ ] IsWhitespace))
1096-
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws]
1097-
// CHECK-NEXT: (CXComment_Paragraph
1098-
// CHECK-NEXT: (CXComment_Text Text=[ Bbb.] HasTrailingNewline)
1099-
// CHECK-NEXT: (CXComment_Text Text=[ ] IsWhitespace)))
1100-
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws]
1101-
// CHECK-NEXT: (CXComment_Paragraph
1102-
// CHECK-NEXT: (CXComment_Text Text=[ Ccc.] HasTrailingNewline)
1103-
// CHECK-NEXT: (CXComment_Text Text=[ ] IsWhitespace)))
1104-
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws]
1105-
// CHECK-NEXT: (CXComment_Paragraph
1106-
// CHECK-NEXT: (CXComment_Text Text=[ Ddd.]))))]
1093+
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws] Arg[0]=Bbb.
1094+
// CHECK-NEXT: (CXComment_Paragraph IsWhitespace))
1095+
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws] Arg[0]=Ccc.
1096+
// CHECK-NEXT: (CXComment_Paragraph IsWhitespace))
1097+
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws] Arg[0]=Ddd.
1098+
// CHECK-NEXT: (CXComment_Paragraph IsWhitespace)))]
11071099

11081100
/// Aaa.
11091101
/// \throws Bbb.
11101102
/// \throw Ccc.
11111103
void comment_to_xml_conversion_exceptions_5();
1112-
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_5:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_5</Name><USR>c:@F@comment_to_xml_conversion_exceptions_5#</USR><Declaration>void comment_to_xml_conversion_exceptions_5()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions><Para> Bbb. </Para><Para> Ccc.</Para></Exceptions></Function>]
1104+
// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-1]]:6: FunctionDecl=comment_to_xml_conversion_exceptions_5:{{.*}} FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-1]]" column="6"><Name>comment_to_xml_conversion_exceptions_5</Name><USR>c:@F@comment_to_xml_conversion_exceptions_5#</USR><Declaration>void comment_to_xml_conversion_exceptions_5()</Declaration><Abstract><Para> Aaa. </Para></Abstract><Exceptions></Exceptions></Function>]
11131105
// CHECK-NEXT: CommentAST=[
11141106
// CHECK-NEXT: (CXComment_FullComment
11151107
// CHECK-NEXT: (CXComment_Paragraph
11161108
// CHECK-NEXT: (CXComment_Text Text=[ Aaa.] HasTrailingNewline)
11171109
// CHECK-NEXT: (CXComment_Text Text=[ ] IsWhitespace))
1118-
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws]
1119-
// CHECK-NEXT: (CXComment_Paragraph
1120-
// CHECK-NEXT: (CXComment_Text Text=[ Bbb.] HasTrailingNewline)
1121-
// CHECK-NEXT: (CXComment_Text Text=[ ] IsWhitespace)))
1122-
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throw]
1123-
// CHECK-NEXT: (CXComment_Paragraph
1124-
// CHECK-NEXT: (CXComment_Text Text=[ Ccc.]))))]
1110+
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throws] Arg[0]=Bbb.
1111+
// CHECK-NEXT: (CXComment_Paragraph IsWhitespace))
1112+
// CHECK-NEXT: (CXComment_BlockCommand CommandName=[throw] Arg[0]=Ccc.
1113+
// CHECK-NEXT: (CXComment_Paragraph IsWhitespace)))]
11251114

11261115
#endif
11271116

0 commit comments

Comments
 (0)