https://github.com/PeterChou1 updated https://github.com/llvm/llvm-project/pull/97679
>From b5e0335199541225a1b0eb5eaf661cd4df55dbd7 Mon Sep 17 00:00:00 2001 From: PeterChou1 <peter.c...@mail.utoronto.ca> Date: Thu, 4 Jul 2024 01:14:11 -0400 Subject: [PATCH 1/5] [clang-doc] add enum test --- clang-tools-extra/test/clang-doc/enum.cpp | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 clang-tools-extra/test/clang-doc/enum.cpp diff --git a/clang-tools-extra/test/clang-doc/enum.cpp b/clang-tools-extra/test/clang-doc/enum.cpp new file mode 100644 index 0000000000000..2f25eaf4e44e2 --- /dev/null +++ b/clang-tools-extra/test/clang-doc/enum.cpp @@ -0,0 +1,38 @@ +// RUN: clang-doc --format=html --doxygen --output=%t/docs --executor=standalone %s +// RUN: clang-doc --format=md --doxygen --output=%t/docs --executor=standalone %s +// RUN: FileCheck %s -input-file=%t/docs/GlobalNamespace/index.html -check-prefix=HTML-INDEX +// RUN: FileCheck %s -input-file=%t/docs/GlobalNamespace/index.md -check-prefix=MD-INDEX + +/** + * @brief For specifying RGB colors + */ +enum Color { + Red, // Red enums + Green, // Green enums + Blue // Blue enums +}; + +// HTML-INDEX: <h1>Global Namespace</h1> +// HTML-INDEX: <h2 id="Enums">Enums</h2> +// HTML-INDEX: <div> +// HTML-INDEX: <h3 id="{{([0-9A-F]{40})}}">enum Color</h3> +// HTML-INDEX: <ul> +// HTML-INDEX: <li>Red</li> +// HTML-INDEX: <li>Green</li> +// HTML-INDEX: <li>Blue</li> +// HTML-INDEX: </ul> +// HTML-INDEX: <p>Defined at line 11 of file {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp</p> +// HTML-INDEX: <div> +// HTML-INDEX: <div></div> +// HTML-INDEX: </div> +// HTML-INDEX: </div> + +// MD-INDEX: # Global Namespace +// MD-INDEX: ## Enums +// MD-INDEX: | enum Color | +// MD-INDEX: -- +// MD-INDEX: | Red | +// MD-INDEX: | Green | +// MD-INDEX: | Blue | +// MD-INDEX: *Defined at {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp#11* +// MD-INDEX: **brief** For specifying RGB colors \ No newline at end of file >From c10f9d42c26e6d26833a35824216529ab25e7fe8 Mon Sep 17 00:00:00 2001 From: PeterChou1 <peter.c...@mail.utoronto.ca> Date: Thu, 4 Jul 2024 01:53:19 -0400 Subject: [PATCH 2/5] [clang-doc] update defined at line --- clang-tools-extra/test/clang-doc/enum.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang-tools-extra/test/clang-doc/enum.cpp b/clang-tools-extra/test/clang-doc/enum.cpp index 2f25eaf4e44e2..1e7dd6e4c5b0c 100644 --- a/clang-tools-extra/test/clang-doc/enum.cpp +++ b/clang-tools-extra/test/clang-doc/enum.cpp @@ -21,7 +21,7 @@ enum Color { // HTML-INDEX: <li>Green</li> // HTML-INDEX: <li>Blue</li> // HTML-INDEX: </ul> -// HTML-INDEX: <p>Defined at line 11 of file {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp</p> +// HTML-INDEX: <p>Defined at line 9 of file {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp</p> // HTML-INDEX: <div> // HTML-INDEX: <div></div> // HTML-INDEX: </div> >From 8709091091b0ca889ca7911e06b7a4dae61a3581 Mon Sep 17 00:00:00 2001 From: PeterChou1 <peter.c...@mail.utoronto.ca> Date: Thu, 4 Jul 2024 02:06:08 -0400 Subject: [PATCH 3/5] [clang-doc] fix lines --- clang-tools-extra/test/clang-doc/enum.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang-tools-extra/test/clang-doc/enum.cpp b/clang-tools-extra/test/clang-doc/enum.cpp index 1e7dd6e4c5b0c..5a1452788a55f 100644 --- a/clang-tools-extra/test/clang-doc/enum.cpp +++ b/clang-tools-extra/test/clang-doc/enum.cpp @@ -34,5 +34,5 @@ enum Color { // MD-INDEX: | Red | // MD-INDEX: | Green | // MD-INDEX: | Blue | -// MD-INDEX: *Defined at {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp#11* +// MD-INDEX: *Defined at {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp#9* // MD-INDEX: **brief** For specifying RGB colors \ No newline at end of file >From 6b7dbe5b3bf2ceb7fe72ec061e3d9bc3e2609299 Mon Sep 17 00:00:00 2001 From: PeterChou1 <peter.c...@mail.utoronto.ca> Date: Fri, 12 Jul 2024 05:28:15 -0400 Subject: [PATCH 4/5] [clang-doc] address pr --- clang-tools-extra/test/clang-doc/enum.cpp | 28 +++++++++-------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/clang-tools-extra/test/clang-doc/enum.cpp b/clang-tools-extra/test/clang-doc/enum.cpp index 5a1452788a55f..971d63e590f2d 100644 --- a/clang-tools-extra/test/clang-doc/enum.cpp +++ b/clang-tools-extra/test/clang-doc/enum.cpp @@ -1,31 +1,25 @@ +// RUN: rm -rf %t && mkdir -p %t // RUN: clang-doc --format=html --doxygen --output=%t/docs --executor=standalone %s // RUN: clang-doc --format=md --doxygen --output=%t/docs --executor=standalone %s -// RUN: FileCheck %s -input-file=%t/docs/GlobalNamespace/index.html -check-prefix=HTML-INDEX -// RUN: FileCheck %s -input-file=%t/docs/GlobalNamespace/index.md -check-prefix=MD-INDEX +// RUN: FileCheck %s < %t/docs/GlobalNamespace/index.html -check-prefix=HTML-INDEX +// RUN: FileCheck %s < %t/docs/GlobalNamespace/index.md -check-prefix=MD-INDEX /** * @brief For specifying RGB colors */ enum Color { - Red, // Red enums - Green, // Green enums - Blue // Blue enums + Red, + Green, + Blue }; // HTML-INDEX: <h1>Global Namespace</h1> // HTML-INDEX: <h2 id="Enums">Enums</h2> -// HTML-INDEX: <div> -// HTML-INDEX: <h3 id="{{([0-9A-F]{40})}}">enum Color</h3> -// HTML-INDEX: <ul> -// HTML-INDEX: <li>Red</li> -// HTML-INDEX: <li>Green</li> -// HTML-INDEX: <li>Blue</li> -// HTML-INDEX: </ul> -// HTML-INDEX: <p>Defined at line 9 of file {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp</p> -// HTML-INDEX: <div> -// HTML-INDEX: <div></div> -// HTML-INDEX: </div> -// HTML-INDEX: </div> +// HTML-INDEX: <h3 id="{{([0-9A-F]{40})}}">enum Color</h3> +// HTML-INDEX: <li>Red</li> +// HTML-INDEX: <li>Green</li> +// HTML-INDEX: <li>Blue</li> +// HTML-INDEX: <p>Defined at line 9 of file {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp</p> // MD-INDEX: # Global Namespace // MD-INDEX: ## Enums >From e5494dc8a038bb86a6225f5a0b0556dd2679d9f8 Mon Sep 17 00:00:00 2001 From: PeterChou1 <peter.c...@mail.utoronto.ca> Date: Fri, 12 Jul 2024 06:52:57 -0400 Subject: [PATCH 5/5] [clang-doc] update lines --- clang-tools-extra/test/clang-doc/enum.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang-tools-extra/test/clang-doc/enum.cpp b/clang-tools-extra/test/clang-doc/enum.cpp index 971d63e590f2d..4bdf0cf79c127 100644 --- a/clang-tools-extra/test/clang-doc/enum.cpp +++ b/clang-tools-extra/test/clang-doc/enum.cpp @@ -19,7 +19,7 @@ enum Color { // HTML-INDEX: <li>Red</li> // HTML-INDEX: <li>Green</li> // HTML-INDEX: <li>Blue</li> -// HTML-INDEX: <p>Defined at line 9 of file {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp</p> +// HTML-INDEX: <p>Defined at line 10 of file {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp</p> // MD-INDEX: # Global Namespace // MD-INDEX: ## Enums @@ -28,5 +28,5 @@ enum Color { // MD-INDEX: | Red | // MD-INDEX: | Green | // MD-INDEX: | Blue | -// MD-INDEX: *Defined at {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp#9* +// MD-INDEX: *Defined at {{.*}}clang-tools-extra{{[\/]}}test{{[\/]}}clang-doc{{[\/]}}enum.cpp#10* // MD-INDEX: **brief** For specifying RGB colors \ No newline at end of file _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits