feat(HandlebarsGenerator): unify signature helpers

cppalliance · Nov 28, 2024 · e33b47d · e33b47d
1 parent 3f0ddbd
commit e33b47d
Show file tree

Hide file tree

Showing 83 changed files with 486 additions and 554 deletions.
diff --git a/share/mrdocs/addons/generator/adoc/partials/signature/using.adoc.hbs b/share/mrdocs/addons/generator/adoc/partials/signature/using.adoc.hbs
diff --git a/...or/adoc/partials/signature/alias.adoc.hbs → ...rator/common/partials/signature/alias.hbs b/...or/adoc/partials/signature/alias.adoc.hbs → ...rator/common/partials/signature/alias.hbs
diff --git a/.../adoc/partials/signature/concept.adoc.hbs → ...tor/common/partials/signature/concept.hbs b/.../adoc/partials/signature/concept.adoc.hbs → ...tor/common/partials/signature/concept.hbs
diff --git a/...tor/adoc/partials/signature/enum.adoc.hbs → ...erator/common/partials/signature/enum.hbs b/...tor/adoc/partials/signature/enum.adoc.hbs → ...erator/common/partials/signature/enum.hbs
diff --git a/...oc/partials/signature/enumerator.adoc.hbs → .../common/partials/signature/enumerator.hbs b/...oc/partials/signature/enumerator.adoc.hbs → .../common/partials/signature/enumerator.hbs
diff --git a/...or/adoc/partials/signature/field.adoc.hbs → ...rator/common/partials/signature/field.hbs b/...or/adoc/partials/signature/field.adoc.hbs → ...rator/common/partials/signature/field.hbs
diff --git a/...r/adoc/partials/signature/friend.adoc.hbs → ...ator/common/partials/signature/friend.hbs b/...r/adoc/partials/signature/friend.adoc.hbs → ...ator/common/partials/signature/friend.hbs
diff --git a/...adoc/partials/signature/function.adoc.hbs → ...or/common/partials/signature/function.hbs b/...adoc/partials/signature/function.adoc.hbs → ...or/common/partials/signature/function.hbs
diff --git a/...or/adoc/partials/signature/guide.adoc.hbs → ...rator/common/partials/signature/guide.hbs b/...or/adoc/partials/signature/guide.adoc.hbs → ...rator/common/partials/signature/guide.hbs
diff --git a/...doc/partials/signature/namespace.adoc.hbs → ...r/common/partials/signature/namespace.hbs b/...doc/partials/signature/namespace.adoc.hbs → ...r/common/partials/signature/namespace.hbs
diff --git a/...r/adoc/partials/signature/record.adoc.hbs → ...ator/common/partials/signature/record.hbs b/...r/adoc/partials/signature/record.adoc.hbs → ...ator/common/partials/signature/record.hbs
diff --git a/...artials/signature/specialization.adoc.hbs → ...mon/partials/signature/specialization.hbs b/...artials/signature/specialization.adoc.hbs → ...mon/partials/signature/specialization.hbs
diff --git a/.../adoc/partials/signature/typedef.adoc.hbs → ...tor/common/partials/signature/typedef.hbs b/.../adoc/partials/signature/typedef.adoc.hbs → ...tor/common/partials/signature/typedef.hbs
diff --git a/...doc/partials/signature/undefined.adoc.hbs → ...r/common/partials/signature/undefined.hbs b/...doc/partials/signature/undefined.adoc.hbs → ...r/common/partials/signature/undefined.hbs
diff --git a/share/mrdocs/addons/generator/common/partials/signature/using.hbs b/share/mrdocs/addons/generator/common/partials/signature/using.hbs
@@ -0,0 +1 @@
+using {{#if (contains (arr "typename" "enum") symbol.class)}} {{symbol.class}}{{/if}}{{#if symbol.qualifier}}{{>types/name-info symbol.qualifier}}::{{/if}}{{symbol.name}}
diff --git a/...adoc/partials/signature/variable.adoc.hbs → ...or/common/partials/signature/variable.hbs b/...adoc/partials/signature/variable.adoc.hbs → ...or/common/partials/signature/variable.hbs
diff --git a/share/mrdocs/addons/generator/common/partials/types/template-args.hbs b/share/mrdocs/addons/generator/common/partials/types/template-args.hbs
@@ -1,5 +1,5 @@
 {{! Render all template arguments }}
-<{{~#each args~}}
+{{ str '<' }}{{~#each args~}}
 {{~>types/template-arg nolink=../nolink~}}
 {{~#if (not @last)}}, {{/if~}}
-{{~/each~}}>
+{{~/each~}}{{ str '>' }}
diff --git a/share/mrdocs/addons/generator/common/partials/types/template-head.hbs b/share/mrdocs/addons/generator/common/partials/types/template-head.hbs
@@ -1,5 +1,5 @@
 {{! Renders the template head for a template declaration. }}
-template<{{#each params}}{{#unless (and @first @last)}}
+template{{ str '<' }}{{#each params}}{{#unless (and @first @last)}}
     {{/unless}}{{>types/template-param~}}
     {{#unless @last}},{{/unless~}}
-{{/each}}>{{#if requires}} requires {{requires}}{{/if}}
+{{/each}}{{ str '>' }}{{#if requires}} requires {{requires}}{{/if}}
diff --git a/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/alias.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/concept.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/concept.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/enum.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/enum.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/enumerator.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/enumerator.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/field.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/field.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/friend.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/friend.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/function.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/function.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/guide.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/namespace.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/namespace.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/record.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/record.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/specialization.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/specialization.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/typedef.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/typedef.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/undefined.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/undefined.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/using.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/using.html.hbs
diff --git a/share/mrdocs/addons/generator/html/partials/signature/variable.html.hbs b/share/mrdocs/addons/generator/html/partials/signature/variable.html.hbs
diff --git a/test-files/golden-tests/alias-template.html b/test-files/golden-tests/alias-template.html
@@ -72,7 +72,7 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<typename T>
+            template&lt;typename T&gt;
 struct A;
         </pre>
     </div>
@@ -100,9 +100,9 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<
+            template&lt;
     typename T,
-    typename U>
+    typename U&gt;
 struct B;
         </pre>
     </div>
@@ -130,8 +130,8 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<typename T>
-using C = <a href="#A">A</a><T>;
+            template&lt;typename T&gt;
+using C = <a href="#A">A</a>&lt;T&gt;;
         </pre>
     </div>
 
@@ -154,7 +154,7 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<typename T>
+            template&lt;typename T&gt;
 struct D;
         </pre>
     </div>
@@ -203,8 +203,8 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<typename U>
-using E = <a href="#B">B</a><T, U>;
+            template&lt;typename U&gt;
+using E = <a href="#B">B</a>&lt;T, U&gt;;
         </pre>
     </div>
 

diff --git a/test-files/golden-tests/class-template-partial-spec.html b/test-files/golden-tests/class-template-partial-spec.html
@@ -51,7 +51,7 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<typename T>
+            template&lt;typename T&gt;
 struct A;
         </pre>
     </div>
@@ -77,14 +77,14 @@ <h2> Types</h2>
                     </td>
                 </tr><tr>
                     <td>
-                        <a href="#A-B-06"><code>B<U*, T></code></a> 
+                        <a href="#A-B-06"><code>B&lt;U*, T&gt;</code></a> 
                     </td><td>
 
 
                     </td>
                 </tr><tr>
                     <td>
-                        <a href="#A-B-04"><code>B<T, long></code></a> 
+                        <a href="#A-B-04"><code>B&lt;T, long&gt;</code></a> 
                     </td><td>
 
 
@@ -114,9 +114,9 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<
+            template&lt;
     typename U,
-    typename V>
+    typename V&gt;
 struct B;
         </pre>
     </div>
@@ -144,8 +144,8 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<typename U>
-struct <a href="#A-B-0a">B</a><U*, T>;
+            template&lt;typename U&gt;
+struct <a href="#A-B-0a">B</a>&lt;U*, T&gt;;
         </pre>
     </div>
 
@@ -172,8 +172,8 @@ <h3>Synopsis</h3>
             </code>
         </div>
         <pre class="source-code cpp">
-            template<>
-struct <a href="#A-B-0a">B</a><T, long>;
+            template&lt;&gt;
+struct <a href="#A-B-0a">B</a>&lt;T, long&gt;;
         </pre>
     </div>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		using {{#if (contains (arr "typename" "enum") symbol.class)}} {{symbol.class}}{{/if}}{{#if symbol.qualifier}}{{>types/name-info symbol.qualifier}}::{{/if}}{{symbol.name}}