Skip to content

Commit

Permalink
Reword qualifiers and support _Nonnull attributes
Browse files Browse the repository at this point in the history 
Get qualifiers in the right places and change how they are printed
to be more clear. The qualifiers on the Type are for the innermost
(non-pointer) type. The pointer qualifiers are for the pointers.
  • Loading branch information
@danakj
danakj committed Sep 7, 2023
1 parent 2ba801a commit 5e0bd4f
Show file tree
Hide file tree
Showing 9 changed files with 339 additions and 130 deletions.
16 changes: 8 additions & 8 deletions subdoc/gen_tests/struct-complex/S.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@
</div>
<div class="section-items">
<div class="section-item">
<div class="item-name member-signature"><span class="static">static</span>bool <a class="field-name" name="field.static_bool_member" href="S.html#field.static_bool_member">static_bool_member</a></div>
<div class="item-name member-signature"><span class="static">static</span> bool <a class="field-name" name="field.static_bool_member" href="S.html#field.static_bool_member">static_bool_member</a></div>
<div class="description long">
<p>Comment headline static_bool_member</p>

</div>
</div>
<div class="section-item">
<div class="item-name member-signature"><span class="static">static</span><a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> <span class="volatile">volatile</span> <a class="field-name" name="field.static_type_member" href="S.html#field.static_type_member">static_type_member</a></div>
<div class="item-name member-signature"><span class="static">static</span> <span class="volatile">volatile</span> <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> <a class="field-name" name="field.static_type_member" href="S.html#field.static_type_member">static_type_member</a></div>
<div class="description long">
<p>Comment headline static_type_member</p>

Expand All @@ -140,7 +140,7 @@
<div class="section-items">
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.static_bool_method"></a><span class="static">static</span><span class="function-auto">auto</span><a class="function-name" href="S.html#method.static_bool_method">static_bool_method</a>() -&gt; bool </div>
<div class="function-signature"><a name="method.static_bool_method"></a><span class="static">static</span> <span class="function-auto">auto</span> <a class="function-name" href="S.html#method.static_bool_method">static_bool_method</a>() -&gt; bool </div>
</div>
</div>
<div class="description long">
Expand All @@ -149,7 +149,7 @@
</div>
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.static_type_method"></a><span class="static">static</span><span class="function-auto">auto</span><a class="function-name" href="S.html#method.static_type_method">static_type_method</a>() -&gt; <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> </div>
<div class="function-signature"><a name="method.static_type_method"></a><span class="static">static</span> <span class="function-auto">auto</span> <a class="function-name" href="S.html#method.static_type_method">static_type_method</a>() -&gt; <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> </div>
</div>
</div>
<div class="description long">
Expand All @@ -165,14 +165,14 @@
<div class="section-items">
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.int_method"></a><span class="function-auto">auto</span><a class="function-name" href="S.html#method.int_method">int_method</a>() volatile -&gt; void </div>
<div class="function-signature"><a name="method.int_method"></a><span class="function-auto">auto</span> <a class="function-name" href="S.html#method.int_method">int_method</a>() volatile -&gt; void </div>
</div>
</div>
<div class="description long">
</div>
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.type_method"></a><span class="function-auto">auto</span><a class="function-name" href="S.html#method.type_method">type_method</a>() -&gt; <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> </div>
<div class="function-signature"><a name="method.type_method"></a><span class="function-auto">auto</span> <a class="function-name" href="S.html#method.type_method">type_method</a>() -&gt; <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> </div>
</div>
</div>
<div class="description long">
Expand All @@ -181,7 +181,7 @@
</div>
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.void_method"></a><span class="function-auto">auto</span><a class="function-name" href="S.html#method.void_method">void_method</a>() const& -&gt; void </div>
<div class="function-signature"><a name="method.void_method"></a><span class="function-auto">auto</span> <a class="function-name" href="S.html#method.void_method">void_method</a>() const& -&gt; void </div>
</div>
</div>
<div class="description long">
Expand All @@ -203,7 +203,7 @@
</div>
</div>
<div class="section-item">
<div class="item-name member-signature"><a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> <span class="const">const</span> <a class="field-name" name="field.type_field" href="S.html#field.type_field">type_field</a></div>
<div class="item-name member-signature"><span class="const">const</span> <a class="type-name" href="OtherType.html" title="OtherType">OtherType</a> <a class="field-name" name="field.type_field" href="S.html#field.type_field">type_field</a></div>
<div class="description long">
<p>Comment headline type_field</p>

Expand Down
4 changes: 0 additions & 4 deletions subdoc/gen_tests/subdoc-test-style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@ main {
}


.overload .function-signature span {
margin-right: 0.4em; /* Put back the space after other elements */
}

.description.short {
margin: 0;
line-height: 1.2;
Expand Down
10 changes: 5 additions & 5 deletions subdoc/gen_tests/templates/TemplateMethods.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
</div>
<div class="section-items">
<div class="section-item">
<div class="item-name member-signature"><div class="template">template &lt;class U&gt;</div><span class="static">static</span>U <a class="field-name" name="field.member" href="TemplateMethods.html#field.member">member</a></div>
<div class="item-name member-signature"><div class="template">template &lt;class U&gt;</div><span class="static">static</span> U <a class="field-name" name="field.member" href="TemplateMethods.html#field.member">member</a></div>
<div class="description long">
</div>
</div>
Expand All @@ -144,21 +144,21 @@
<div class="section-items">
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.concept_param"></a><div class="template">template &lt;class var:auto&gt;</div><span class="function-auto">auto</span><a class="function-name" href="TemplateMethods.html#method.concept_param">concept_param</a>(<a class="type-name" href="Concept.html" title="Concept">Concept</a> auto var) -&gt; void </div>
<div class="function-signature"><a name="method.concept_param"></a><div class="template">template &lt;class var:auto&gt;</div><span class="function-auto">auto</span> <a class="function-name" href="TemplateMethods.html#method.concept_param">concept_param</a>(<a class="type-name" href="Concept.html" title="Concept">Concept</a> auto var) -&gt; void </div>
</div>
</div>
<div class="description long">
</div>
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.concept_return"></a><span class="function-auto">auto</span><a class="function-name" href="TemplateMethods.html#method.concept_return">concept_return</a>() -&gt; <a class="type-name" href="Concept.html" title="Concept">Concept</a>&lt;S&gt; auto </div>
<div class="function-signature"><a name="method.concept_return"></a><span class="function-auto">auto</span> <a class="function-name" href="TemplateMethods.html#method.concept_return">concept_return</a>() -&gt; <a class="type-name" href="Concept.html" title="Concept">Concept</a>&lt;S&gt; auto </div>
</div>
</div>
<div class="description long">
</div>
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.local_template_params"></a><div class="template">template &lt;class U&gt;</div><span class="function-auto">auto</span><a class="function-name" href="TemplateMethods.html#method.local_template_params">local_template_params</a>(T t, U u) -&gt; U <div class="requires">
<div class="function-signature"><a name="method.local_template_params"></a><div class="template">template &lt;class U&gt;</div><span class="function-auto">auto</span> <a class="function-name" href="TemplateMethods.html#method.local_template_params">local_template_params</a>(T t, U u) -&gt; U <div class="requires">
<span class="requires-keyword keyword">
requires
</span>
Expand All @@ -175,7 +175,7 @@
</div>
<div class="overload-set item-name">
<div class="overload">
<div class="function-signature"><a name="method.template_params"></a><span class="function-auto">auto</span><a class="function-name" href="TemplateMethods.html#method.template_params">template_params</a>(T t) -&gt; T <div class="requires">
<div class="function-signature"><a name="method.template_params"></a><span class="function-auto">auto</span> <a class="function-name" href="TemplateMethods.html#method.template_params">template_params</a>(T t) -&gt; T <div class="requires">
<span class="requires-keyword keyword">
requires
</span>
Expand Down
Loading

0 comments on commit 5e0bd4f

Please sign in to comment.