r195176 - Comment parsing tests: introduce a little more structure in testcase

Dmitri Gribenko Tue, 19 Nov 2013 16:22:58 -0800

Author: gribozavr
Date: Tue Nov 19 18:15:58 2013
New Revision: 195176

URL: http://llvm.org/viewvc/llvm-project?rev=195176&view=rev
Log:
Comment parsing tests: introduce a little more structure in testcase


Modified:
    cfe/trunk/test/Index/comment-to-html-xml-conversion.cpp

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=195176&r1=195175&r2=195176&view=diff
==============================================================================
--- cfe/trunk/test/Index/comment-to-html-xml-conversion.cpp (original)
+++ cfe/trunk/test/Index/comment-to-html-xml-conversion.cpp Tue Nov 19 18:15:58 
2013
@@ -25,6 +25,10 @@
 #ifndef HEADER
 #define HEADER
 
+//===---
+// Tests for \brief and its aliases.
+//===---
+
 /// Aaa.
 void test_cmd_brief_like_1();
 
@@ -127,12 +131,16 @@ void test_cmd_brief_like_7();
 // CHECK-NEXT:       (CXComment_Paragraph
 // CHECK-NEXT:         (CXComment_Text Text=[ Bbb.])))]
 
+//===---
+// Tests for \returns and its aliases.
+//===---
+
 /// Aaa.
 ///
 /// \return Bbb.
-void comment_to_html_conversion_7();
+void test_cmd_returns_like_1();
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_7:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><div class="result-discussion"><p 
class="para-returns"><span class="word-returns">Returns</span>  Bbb.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_7</Name><USR>c:@F@comment_to_html_conversion_7#</USR><Declaration>void
 comment_to_html_conversion_7()</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><ResultDiscussion><Para> 
Bbb.</Para></ResultDiscussion></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_returns_like_1:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><div class="result-discussion"><p 
class="para-returns"><span class="word-returns">Returns</span>  Bbb.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_returns_like_1</Name><USR>c:@F@test_cmd_returns_like_1#</USR><Declaration>void
 test_cmd_returns_like_1()</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><ResultDiscussion><Para> 
Bbb.</Para></ResultDiscussion></Function>]
 
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
@@ -147,9 +155,9 @@ void comment_to_html_conversion_7();
 /// Aaa.
 ///
 /// \returns Bbb.
-void comment_to_html_conversion_8();
+void test_cmd_returns_like_2();
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_8:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><div class="result-discussion"><p 
class="para-returns"><span class="word-returns">Returns</span>  Bbb.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_8</Name><USR>c:@F@comment_to_html_conversion_8#</USR><Declaration>void
 comment_to_html_conversion_8()</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><ResultDiscussion><Para> 
Bbb.</Para></ResultDiscussion></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_returns_like_2:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><div class="result-discussion"><p 
class="para-returns"><span class="word-returns">Returns</span>  Bbb.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_returns_like_2</Name><USR>c:@F@test_cmd_returns_like_2#</USR><Declaration>void
 test_cmd_returns_like_2()</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><ResultDiscussion><Para> 
Bbb.</Para></ResultDiscussion></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph
@@ -163,9 +171,9 @@ void comment_to_html_conversion_8();
 /// Aaa.
 ///
 /// \result Bbb.
-void comment_to_html_conversion_9();
+void test_cmd_returns_like_3();
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_9:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><div class="result-discussion"><p 
class="para-returns"><span class="word-returns">Returns</span>  Bbb.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_9</Name><USR>c:@F@comment_to_html_conversion_9#</USR><Declaration>void
 comment_to_html_conversion_9()</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><ResultDiscussion><Para> 
Bbb.</Para></ResultDiscussion></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_returns_like_3:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><div class="result-discussion"><p 
class="para-returns"><span class="word-returns">Returns</span>  Bbb.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_returns_like_3</Name><USR>c:@F@test_cmd_returns_like_3#</USR><Declaration>void
 test_cmd_returns_like_3()</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><ResultDiscussion><Para> 
Bbb.</Para></ResultDiscussion></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph
@@ -178,9 +186,9 @@ void comment_to_html_conversion_9();
 
 /// \returns Aaa.
 /// \returns Bbb.
-void comment_to_html_conversion_10();
+void test_cmd_returns_like_4();
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_10:{{.*}} FullCommentAsHTML=[<div 
class="result-discussion"><p class="para-returns"><span 
class="word-returns">Returns</span>  Aaa. </p><p class="para-returns"><span 
class="word-returns">Returns</span>  Bbb.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_10</Name><USR>c:@F@comment_to_html_conversion_10#</USR><Declaration>void
 comment_to_html_conversion_10()</Declaration><ResultDiscussion><Para> Aaa. 
</Para><Para> Bbb.</Para></ResultDiscussion></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_returns_like_4:{{.*}} FullCommentAsHTML=[<div 
class="result-discussion"><p class="para-returns"><span 
class="word-returns">Returns</span>  Aaa. </p><p class="para-returns"><span 
class="word-returns">Returns</span>  Bbb.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_returns_like_4</Name><USR>c:@F@test_cmd_returns_like_4#</USR><Declaration>void
 test_cmd_returns_like_4()</Declaration><ResultDiscussion><Para> Aaa. 
</Para><Para> Bbb.</Para></ResultDiscussion></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -198,9 +206,9 @@ void comment_to_html_conversion_10();
 /// Bbb.
 ///
 /// \returns Ccc.
-void comment_to_html_conversion_11();
+void test_cmd_returns_like_5();
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_11:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><p> Bbb.</p><div class="result-discussion"><p 
class="para-returns"><span class="word-returns">Returns</span>  Ccc.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_11</Name><USR>c:@F@comment_to_html_conversion_11#</USR><Declaration>void
 comment_to_html_conversion_11()</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><ResultDiscussion><Para> 
Ccc.</Para></ResultDiscussion><Discussion><Para> 
Bbb.</Para></Discussion></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_returns_like_5:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><p> Bbb.</p><div class="result-discussion"><p 
class="para-returns"><span class="word-returns">Returns</span>  Ccc.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_returns_like_5</Name><USR>c:@F@test_cmd_returns_like_5#</USR><Declaration>void
 test_cmd_returns_like_5()</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><ResultDiscussion><Para> 
Ccc.</Para></ResultDiscussion><Discussion><Para> 
Bbb.</Para></Discussion></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph
@@ -213,10 +221,14 @@ void comment_to_html_conversion_11();
 // CHECK-NEXT:         (CXComment_Paragraph
 // CHECK-NEXT:           (CXComment_Text Text=[ Ccc.]))))]
 
+//===---
+// Tests for \param.
+//===---
+
 /// \param
-void comment_to_html_conversion_12(int x1);
+void test_cmd_param_1(int x1);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_12:{{.*}} FullCommentAsHTML=[] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_12</Name><USR>c:@F@comment_to_html_conversion_12#I#</USR><Declaration>void
 comment_to_html_conversion_12(int x1)</Declaration></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_param_1:{{.*}} FullCommentAsHTML=[] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_param_1</Name><USR>c:@F@test_cmd_param_1#I#</USR><Declaration>void
 test_cmd_param_1(int x1)</Declaration></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -225,9 +237,9 @@ void comment_to_html_conversion_12(int x
 // CHECK-NEXT:         (CXComment_Paragraph IsWhitespace)))]
 
 /// \param x1 Aaa.
-void comment_to_html_conversion_13(int x1);
+void test_cmd_param_2(int x1);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_13:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> 
Aaa.</dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_13</Name><USR>c:@F@comment_to_html_conversion_13#I#</USR><Declaration>void
 comment_to_html_conversion_13(int 
x1)</Declaration><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> 
Aaa.</Para></Discussion></Parameter></Parameters></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_param_2:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> 
Aaa.</dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>test_cmd_param_2</Name><USR>c:@F@test_cmd_param_2#I#</USR><Declaration>void
 test_cmd_param_2(int 
x1)</Declaration><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> 
Aaa.</Para></Discussion></Parameter></Parameters></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -237,9 +249,9 @@ void comment_to_html_conversion_13(int x
 // CHECK-NEXT:           (CXComment_Text Text=[ Aaa.]))))]
 
 /// \param zzz Aaa.
-void comment_to_html_conversion_14(int x1);
+void test_cmd_param_3(int x1);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_14:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-invalid">zzz</dt><dd class="param-descr-index-invalid"> 
Aaa.</dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_14</Name><USR>c:@F@comment_to_html_conversion_14#I#</USR><Declaration>void
 comment_to_html_conversion_14(int 
x1)</Declaration><Parameters><Parameter><Name>zzz</Name><Direction 
isExplicit="0">in</Direction><Discussion><Para> 
Aaa.</Para></Discussion></Parameter></Parameters></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_param_3:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-invalid">zzz</dt><dd class="param-descr-index-invalid"> 
Aaa.</dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>test_cmd_param_3</Name><USR>c:@F@test_cmd_param_3#I#</USR><Declaration>void
 test_cmd_param_3(int 
x1)</Declaration><Parameters><Parameter><Name>zzz</Name><Direction 
isExplicit="0">in</Direction><Discussion><Para> 
Aaa.</Para></Discussion></Parameter></Parameters></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -250,9 +262,9 @@ void comment_to_html_conversion_14(int x
 
 /// \param x2 Bbb.
 /// \param x1 Aaa.
-void comment_to_html_conversion_15(int x1, int x2);
+void test_cmd_param_4(int x1, int x2);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_15:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> Aaa.</dd><dt 
class="param-name-index-1">x2</dt><dd class="param-descr-index-1"> Bbb. 
</dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_15</Name><USR>c:@F@comment_to_html_conversion_15#I#I#</USR><Declaration>void
 comment_to_html_conversion_15(int x1, int 
x2)</Declaration><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> 
Aaa.</Para></Discussion></Parameter><Parameter><Name>x2</Name><Index>1</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Bbb. 
</Para></Discussion></Parameter></Parameters></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_param_4:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> Aaa.</dd><dt 
class="param-name-index-1">x2</dt><dd class="param-descr-index-1"> Bbb. 
</dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>test_cmd_param_4</Name><USR>c:@F@test_cmd_param_4#I#I#</USR><Declaration>void
 test_cmd_param_4(int x1, int 
x2)</Declaration><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> 
Aaa.</Para></Discussion></Parameter><Parameter><Name>x2</Name><Index>1</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Bbb. 
</Para></Discussion></Parameter></Parameters></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -268,9 +280,9 @@ void comment_to_html_conversion_15(int x
 /// \param x2 Bbb.
 /// \param zzz Aaa.
 /// \param x1 Aaa.
-void comment_to_html_conversion_16(int x1, int x2);
+void test_cmd_param_5(int x1, int x2);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_16:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> Aaa.</dd><dt 
class="param-name-index-1">x2</dt><dd class="param-descr-index-1"> Bbb. 
</dd><dt class="param-name-index-invalid">zzz</dt><dd 
class="param-descr-index-invalid"> Aaa. </dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_16</Name><USR>c:@F@comment_to_html_conversion_16#I#I#</USR><Declaration>void
 comment_to_html_conversion_16(int x1, int 
x2)</Declaration><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> 
Aaa.</Para></Discussion></Parameter><Parameter><Name>x2</Name><Index>1</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Bbb. 
</Para></Discussion></Parameter><Parameter><Name>zzz</Name><!
 Direction
  isExplicit="0">in</Direction><Discussion><Para> Aaa. 
</Para></Discussion></Parameter></Parameters></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_param_5:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> Aaa.</dd><dt 
class="param-name-index-1">x2</dt><dd class="param-descr-index-1"> Bbb. 
</dd><dt class="param-name-index-invalid">zzz</dt><dd 
class="param-descr-index-invalid"> Aaa. </dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>test_cmd_param_5</Name><USR>c:@F@test_cmd_param_5#I#I#</USR><Declaration>void
 test_cmd_param_5(int x1, int 
x2)</Declaration><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> 
Aaa.</Para></Discussion></Parameter><Parameter><Name>x2</Name><Index>1</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Bbb. 
</Para></Discussion></Parameter><Parameter><Name>zzz</Name><Direction 
isExplicit="0">in</Direction><Discussion><!
 Para> Aaa
 . </Para></Discussion></Parameter></Parameters></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -289,9 +301,9 @@ void comment_to_html_conversion_16(int x
 
 /// \param x1 Aaa.
 /// \param ... Bbb.
-void comment_to_html_conversion_17(int x1, ...);
+void test_cmd_param_6(int x1, ...);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_17:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> Aaa. 
</dd><dt class="param-name-index-vararg">...</dt><dd 
class="param-descr-index-vararg"> Bbb.</dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_17</Name><USR>c:@F@comment_to_html_conversion_17#I.#</USR><Declaration>void
 comment_to_html_conversion_17(int x1, 
...)</Declaration><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Aaa. 
</Para></Discussion></Parameter><Parameter><Name>...</Name><IsVarArg 
/><Direction isExplicit="0">in</Direction><Discussion><Para> 
Bbb.</Para></Discussion></Parameter></Parameters></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_cmd_param_6:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> Aaa. 
</dd><dt class="param-name-index-vararg">...</dt><dd 
class="param-descr-index-vararg"> Bbb.</dd></dl>] FullCommentAsXML=[<Function 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>test_cmd_param_6</Name><USR>c:@F@test_cmd_param_6#I.#</USR><Declaration>void
 test_cmd_param_6(int x1, 
...)</Declaration><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Aaa. 
</Para></Discussion></Parameter><Parameter><Name>...</Name><IsVarArg 
/><Direction isExplicit="0">in</Direction><Discussion><Para> 
Bbb.</Para></Discussion></Parameter></Parameters></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -304,12 +316,16 @@ void comment_to_html_conversion_17(int x
 // CHECK-NEXT:         (CXComment_Paragraph
 // CHECK-NEXT:           (CXComment_Text Text=[ Bbb.]))))]
 
+//===---
+// Tests for \tparam.
+//===---
+
 /// \tparam
 /// \param aaa Blah blah
 template<typename T>
-void comment_to_html_conversion_18(T aaa);
+void test_cmd_tparam_1(T aaa);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=comment_to_html_conversion_18:{{.*}} 
FullCommentAsHTML=[<dl><dt class="param-name-index-0">aaa</dt><dd 
class="param-descr-index-0"> Blah blah</dd></dl>] FullCommentAsXML=[<Function 
templateKind="template" file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_18</Name><USR>c:@FT@&gt;1#Tcomment_to_html_conversion_18#t0.0#</USR><Declaration>template
 &lt;typename T&gt; void comment_to_html_conversion_18(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>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=test_cmd_tparam_1:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">aaa</dt><dd class="param-descr-index-0"> Blah 
blah</dd></dl>] FullCommentAsXML=[<Function templateKind="template" 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>test_cmd_tparam_1</Name><USR>c:@FT@&gt;1#Ttest_cmd_tparam_1#t0.0#</USR><Declaration>template
 &lt;typename T&gt; void test_cmd_tparam_1(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>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -324,9 +340,9 @@ void comment_to_html_conversion_18(T aaa
 /// \tparam T
 /// \param aaa Blah blah
 template<typename T>
-void comment_to_html_conversion_19(T aaa);
+void test_cmd_tparam_2(T aaa);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=comment_to_html_conversion_19:{{.*}} 
FullCommentAsHTML=[<dl><dt class="param-name-index-0">aaa</dt><dd 
class="param-descr-index-0"> Blah blah</dd></dl>] FullCommentAsXML=[<Function 
templateKind="template" file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_19</Name><USR>c:@FT@&gt;1#Tcomment_to_html_conversion_19#t0.0#</USR><Declaration>template
 &lt;typename T&gt; void comment_to_html_conversion_19(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>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=test_cmd_tparam_2:{{.*}} FullCommentAsHTML=[<dl><dt 
class="param-name-index-0">aaa</dt><dd class="param-descr-index-0"> Blah 
blah</dd></dl>] FullCommentAsXML=[<Function templateKind="template" 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>test_cmd_tparam_2</Name><USR>c:@FT@&gt;1#Ttest_cmd_tparam_2#t0.0#</USR><Declaration>template
 &lt;typename T&gt; void test_cmd_tparam_2(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>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -341,9 +357,9 @@ void comment_to_html_conversion_19(T aaa
 /// \tparam T2 Bbb
 /// \tparam T1 Aaa
 template<typename T1, typename T2>
-void comment_to_html_conversion_20(T1 aaa, T2 bbb);
+void test_cmd_tparam_3(T1 aaa, T2 bbb);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=comment_to_html_conversion_20:{{.*}} 
FullCommentAsHTML=[<dl><dt class="tparam-name-index-0">T1</dt><dd 
class="tparam-descr-index-0"> Aaa</dd><dt 
class="tparam-name-index-1">T2</dt><dd class="tparam-descr-index-1"> Bbb 
</dd></dl>] FullCommentAsXML=[<Function templateKind="template" 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_20</Name><USR>c:@FT@&gt;2#T#Tcomment_to_html_conversion_20#t0.0#t0.1#</USR><Declaration>template
 &lt;typename T1, typename T2&gt;\nvoid comment_to_html_conversion_20(T1 aaa, 
T2 
bbb)</Declaration><TemplateParameters><Parameter><Name>T1</Name><Index>0</Index><Discussion><Para>
 
Aaa</Para></Discussion></Parameter><Parameter><Name>T2</Name><Index>1</Index><Discussion><Para>
 Bbb </Para></Discussion></Parameter></TemplateParameters></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=test_cmd_tparam_3:{{.*}} FullCommentAsHTML=[<dl><dt 
class="tparam-name-index-0">T1</dt><dd class="tparam-descr-index-0"> 
Aaa</dd><dt class="tparam-name-index-1">T2</dt><dd 
class="tparam-descr-index-1"> Bbb </dd></dl>] FullCommentAsXML=[<Function 
templateKind="template" file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_tparam_3</Name><USR>c:@FT@&gt;2#T#Ttest_cmd_tparam_3#t0.0#t0.1#</USR><Declaration>template
 &lt;typename T1, typename T2&gt;\nvoid test_cmd_tparam_3(T1 aaa, T2 
bbb)</Declaration><TemplateParameters><Parameter><Name>T1</Name><Index>0</Index><Discussion><Para>
 
Aaa</Para></Discussion></Parameter><Parameter><Name>T2</Name><Index>1</Index><Discussion><Para>
 Bbb </Para></Discussion></Parameter></TemplateParameters></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -361,9 +377,9 @@ void comment_to_html_conversion_20(T1 aa
 /// \tparam V Ccc
 /// \tparam T1 Aaa
 template<typename T1, typename T2, int V>
-void comment_to_html_conversion_21(T1 aaa, T2 bbb);
+void test_cmd_tparam_4(T1 aaa, T2 bbb);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=comment_to_html_conversion_21:{{.*}} 
FullCommentAsHTML=[<dl><dt class="tparam-name-index-0">T1</dt><dd 
class="tparam-descr-index-0"> Aaa</dd><dt 
class="tparam-name-index-1">T2</dt><dd class="tparam-descr-index-1"> Bbb 
</dd><dt class="tparam-name-index-2">V</dt><dd class="tparam-descr-index-2"> 
Ccc </dd><dt class="tparam-name-index-invalid">U</dt><dd 
class="tparam-descr-index-invalid"> Zzz </dd></dl>] FullCommentAsXML=[<Function 
templateKind="template" file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_21</Name><USR>c:@FT@&gt;3#T#T#NIcomment_to_html_conversion_21#t0.0#t0.1#</USR><Declaration>template
 &lt;typename T1, typename T2, int V&gt;\nvoid comment_to_html_conversion_21(T1 
aaa, T2 
bbb)</Declaration><TemplateParameters><Parameter><Name>T1</Name><Index>0</Index><Discussion><Para>
 Aaa</Para></Discussion></Parameter><Parameter><Name>T2<!
 /Name><In
 dex>1</Index><Discussion><Para> Bbb 
</Para></Discussion></Parameter><Parameter><Name>V</Name><Index>2</Index><Discussion><Para>
 Ccc 
</Para></Discussion></Parameter><Parameter><Name>U</Name><Discussion><Para> Zzz 
</Para></Discussion></Parameter></TemplateParameters></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=test_cmd_tparam_4:{{.*}} FullCommentAsHTML=[<dl><dt 
class="tparam-name-index-0">T1</dt><dd class="tparam-descr-index-0"> 
Aaa</dd><dt class="tparam-name-index-1">T2</dt><dd 
class="tparam-descr-index-1"> Bbb </dd><dt 
class="tparam-name-index-2">V</dt><dd class="tparam-descr-index-2"> Ccc 
</dd><dt class="tparam-name-index-invalid">U</dt><dd 
class="tparam-descr-index-invalid"> Zzz </dd></dl>] FullCommentAsXML=[<Function 
templateKind="template" file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_tparam_4</Name><USR>c:@FT@&gt;3#T#T#NItest_cmd_tparam_4#t0.0#t0.1#</USR><Declaration>template
 &lt;typename T1, typename T2, int V&gt;\nvoid test_cmd_tparam_4(T1 aaa, T2 
bbb)</Declaration><TemplateParameters><Parameter><Name>T1</Name><Index>0</Index><Discussion><Para>
 
Aaa</Para></Discussion></Parameter><Parameter><Name>T2</Name><Index>1</Index><Discussion><Para>
 Bbb </P!
 ara></Dis
 
cussion></Parameter><Parameter><Name>V</Name><Index>2</Index><Discussion><Para> 
Ccc </Para></Discussion></Parameter><Parameter><Name>U</Name><Discussion><Para> 
Zzz </Para></Discussion></Parameter></TemplateParameters></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -389,9 +405,9 @@ void comment_to_html_conversion_21(T1 aa
 /// \tparam T Aaa
 /// \tparam TT Bbb
 template<template<template<typename T> class TT, class C> class TTT>
-void comment_to_html_conversion_22();
+void test_cmd_tparam_5();
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=comment_to_html_conversion_22:{{.*}} 
FullCommentAsHTML=[<dl><dt class="tparam-name-index-0">TTT</dt><dd 
class="tparam-descr-index-0"> Ddd </dd><dt 
class="tparam-name-index-other">C</dt><dd class="tparam-descr-index-other"> Ccc 
</dd><dt class="tparam-name-index-other">T</dt><dd 
class="tparam-descr-index-other"> Aaa </dd><dt 
class="tparam-name-index-other">TT</dt><dd class="tparam-descr-index-other"> 
Bbb</dd></dl>] FullCommentAsXML=[<Function templateKind="template" 
file="{{[^"]+}}comment-to-html-xml-conversion.cpp" line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_22</Name><USR>c:@FT@&gt;1#t&gt;2#t&gt;1#T#Tcomment_to_html_conversion_22#</USR><Declaration>template
 &lt;template &lt;template &lt;typename T&gt; class TT, class C&gt; class 
TTT&gt;\nvoid 
comment_to_html_conversion_22()</Declaration><TemplateParameters><Parameter><Name>TTT</Name><Index>0</Index><Discussion><Para>
 Ddd </Para></!
 Discussio
 n></Parameter><Parameter><Name>C</Name><Discussion><Para> Ccc 
</Para></Discussion></Parameter><Parameter><Name>T</Name><Discussion><Para> Aaa 
</Para></Discussion></Parameter><Parameter><Name>TT</Name><Discussion><Para> 
Bbb</Para></Discussion></Parameter></TemplateParameters></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionTemplate=test_cmd_tparam_5:{{.*}} FullCommentAsHTML=[<dl><dt 
class="tparam-name-index-0">TTT</dt><dd class="tparam-descr-index-0"> Ddd 
</dd><dt class="tparam-name-index-other">C</dt><dd 
class="tparam-descr-index-other"> Ccc </dd><dt 
class="tparam-name-index-other">T</dt><dd class="tparam-descr-index-other"> Aaa 
</dd><dt class="tparam-name-index-other">TT</dt><dd 
class="tparam-descr-index-other"> Bbb</dd></dl>] FullCommentAsXML=[<Function 
templateKind="template" file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_cmd_tparam_5</Name><USR>c:@FT@&gt;1#t&gt;2#t&gt;1#T#Ttest_cmd_tparam_5#</USR><Declaration>template
 &lt;template &lt;template &lt;typename T&gt; class TT, class C&gt; class 
TTT&gt;\nvoid 
test_cmd_tparam_5()</Declaration><TemplateParameters><Parameter><Name>TTT</Name><Index>0</Index><Discussion><Para>
 Ddd </Para></Discussion></Parameter><Parameter><Name>C</Name>!
 <Discussi
 on><Para> Ccc 
</Para></Discussion></Parameter><Parameter><Name>T</Name><Discussion><Para> Aaa 
</Para></Discussion></Parameter><Parameter><Name>TT</Name><Discussion><Para> 
Bbb</Para></Discussion></Parameter></TemplateParameters></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -412,6 +428,10 @@ void comment_to_html_conversion_22();
 // CHECK-NEXT:         (CXComment_Paragraph
 // CHECK-NEXT:           (CXComment_Text Text=[ Bbb]))))]
 
+//===---
+// Tests for interaction between commands.
+//===---
+
 /// \brief Aaa.
 ///
 /// Bbb.
@@ -419,9 +439,9 @@ void comment_to_html_conversion_22();
 /// \param x2 Ddd.
 /// \param x1 Ccc.
 /// \returns Eee.
-void comment_to_html_conversion_23(int x1, int x2);
+void test_full_comment_1(int x1, int x2);
 
-// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=comment_to_html_conversion_23:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><p> Bbb.</p><dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> Ccc. 
</dd><dt class="param-name-index-1">x2</dt><dd class="param-descr-index-1"> 
Ddd. </dd></dl><div class="result-discussion"><p class="para-returns"><span 
class="word-returns">Returns</span>  Eee.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>comment_to_html_conversion_23</Name><USR>c:@F@comment_to_html_conversion_23#I#I#</USR><Declaration>void
 comment_to_html_conversion_23(int x1, int x2)</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Ccc. 
</Para></Discussion></Parameter><Parameter><Name>x2</Name><Index>1</Index><Direction
 isExplicit=!
 "0">in</D
 irection><Discussion><Para> Ddd. 
</Para></Discussion></Parameter></Parameters><ResultDiscussion><Para> 
Eee.</Para></ResultDiscussion><Discussion><Para> 
Bbb.</Para></Discussion></Function>]
+// CHECK: comment-to-html-xml-conversion.cpp:[[@LINE-2]]:6: 
FunctionDecl=test_full_comment_1:{{.*}} FullCommentAsHTML=[<p 
class="para-brief"> Aaa.</p><p> Bbb.</p><dl><dt 
class="param-name-index-0">x1</dt><dd class="param-descr-index-0"> Ccc. 
</dd><dt class="param-name-index-1">x2</dt><dd class="param-descr-index-1"> 
Ddd. </dd></dl><div class="result-discussion"><p class="para-returns"><span 
class="word-returns">Returns</span>  Eee.</p></div>] 
FullCommentAsXML=[<Function file="{{[^"]+}}comment-to-html-xml-conversion.cpp" 
line="[[@LINE-2]]" 
column="6"><Name>test_full_comment_1</Name><USR>c:@F@test_full_comment_1#I#I#</USR><Declaration>void
 test_full_comment_1(int x1, int x2)</Declaration><Abstract><Para> 
Aaa.</Para></Abstract><Parameters><Parameter><Name>x1</Name><Index>0</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Ccc. 
</Para></Discussion></Parameter><Parameter><Name>x2</Name><Index>1</Index><Direction
 isExplicit="0">in</Direction><Discussion><Para> Ddd!
 . </Para>
 </Discussion></Parameter></Parameters><ResultDiscussion><Para> 
Eee.</Para></ResultDiscussion><Discussion><Para> 
Bbb.</Para></Discussion></Function>]
 // CHECK-NEXT:  CommentAST=[
 // CHECK-NEXT:    (CXComment_FullComment
 // CHECK-NEXT:       (CXComment_Paragraph IsWhitespace
@@ -445,6 +465,10 @@ void comment_to_html_conversion_23(int x
 // CHECK-NEXT:         (CXComment_Paragraph
 // CHECK-NEXT:           (CXComment_Text Text=[ Eee.]))))]
 
+//===---
+// Misc tests.
+//===---
+
 /// <br><a href="http://example.com/";>Aaa</a>
 void comment_to_html_conversion_24();
 


_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

r195176 - Comment parsing tests: introduce a little more structure in testcase

Reply via email to