Skip to content

Commit e1d7524

Browse files
author
Gennaro Prota
committed
fix: code snippet doesn't include a semicolon when there are base classes
1 parent 9a53a1a commit e1d7524

File tree

20 files changed

+103
-102
lines changed

20 files changed

+103
-102
lines changed

‎share/mrdocs/addons/generator/common/partials/symbol/signature/record.hbs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
{{/each~}}
2020
{{!-- Don't show a semicolon if the record is final, because something
2121
like `class A final;` is ill-formed (`final` can't be used on a
22-
non-defining declaration). --}}
23-
{{/unless}}{{#isSeeBelow}} { /* see-below */ }{{/isSeeBelow}}{{#if isFinal}} final{{else}};{{/if}}
22+
non-defining declaration). Similarly, don't show a semicolon if
23+
there are base classes. --}}
24+
{{/unless}}{{#isSeeBelow}} { /* see-below */ }{{/isSeeBelow}}{{#if isFinal}} final{{else}}{{#if bases}}{{!-- no semicolon --}}{{else}};{{/if}}{{/if}}

‎test-files/golden-tests/config/auto-relates/derived.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ <h3>Synopsis</h3>
6161
<pre>
6262
<code class="source-code cpp">
6363
struct A
64-
: <a href="#ABase">ABase</a>;
64+
: <a href="#ABase">ABase</a>
6565
</code>
6666
</pre>
6767
</div>
@@ -172,7 +172,7 @@ <h3>Synopsis</h3>
172172
<pre>
173173
<code class="source-code cpp">
174174
struct AView
175-
: <a href="#ABase">ABase</a>;
175+
: <a href="#ABase">ABase</a>
176176
</code>
177177
</pre>
178178
</div>
@@ -241,7 +241,7 @@ <h3>Synopsis</h3>
241241
<pre>
242242
<code class="source-code cpp">
243243
struct AView2
244-
: <a href="#AView">AView</a>;
244+
: <a href="#AView">AView</a>
245245
</code>
246246
</pre>
247247
</div>

‎test-files/golden-tests/config/extract-implicit-specializations/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h3>Synopsis</h3>
3535
<pre>
3636
<code class="source-code cpp">
3737
struct A
38-
: <a href="#B">B</a>;
38+
: <a href="#B">B</a>
3939
</code>
4040
</pre>
4141
</div>

‎test-files/golden-tests/config/extract-implicit-specializations/extract-implicit-specializations.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h3>Synopsis</h3>
3535
<pre>
3636
<code class="source-code cpp">
3737
struct A
38-
: <a href="#B-00">B&lt;int&gt;</a>;
38+
: <a href="#B-00">B&lt;int&gt;</a>
3939
</code>
4040
</pre>
4141
</div>

‎test-files/golden-tests/config/extract-implicit-specializations/no-extract-implicit-specializations.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h3>Synopsis</h3>
3535
<pre>
3636
<code class="source-code cpp">
3737
struct A
38-
: <a href="#B">B&lt;int&gt;</a>;
38+
: <a href="#B">B&lt;int&gt;</a>
3939
</code>
4040
</pre>
4141
</div>

‎test-files/golden-tests/config/inherit-base-members/base-overload-set.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h3>Synopsis</h3>
3636
<pre>
3737
<code class="source-code cpp">
3838
class Base
39-
: public <a href="#ConstBase">ConstBase</a>;
39+
: public <a href="#ConstBase">ConstBase</a>
4040
</code>
4141
</pre>
4242
</div>
@@ -156,7 +156,7 @@ <h3>Synopsis</h3>
156156
<pre>
157157
<code class="source-code cpp">
158158
class C
159-
: public <a href="#Base">Base</a>;
159+
: public <a href="#Base">Base</a>
160160
</code>
161161
</pre>
162162
</div>

‎test-files/golden-tests/config/inherit-base-members/copy-dependencies.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h3>Synopsis</h3>
4343
<pre>
4444
<code class="source-code cpp">
4545
class base
46-
: public <a href="#base_base">base_base</a>;
46+
: public <a href="#base_base">base_base</a>
4747
</code>
4848
</pre>
4949
</div>
@@ -372,7 +372,7 @@ <h3>Synopsis</h3>
372372
<code class="source-code cpp">
373373
class derived
374374
: public <a href="#base">base</a>
375-
, public excluded_base;
375+
, public excluded_base
376376
</code>
377377
</pre>
378378
</div>
@@ -556,7 +556,7 @@ <h3>Synopsis</h3>
556556
<code class="source-code cpp">
557557
class private_derived
558558
: <a href="#base">base</a>
559-
, excluded_base;
559+
, excluded_base
560560
</code>
561561
</pre>
562562
</div>
@@ -642,7 +642,7 @@ <h3>Synopsis</h3>
642642
<code class="source-code cpp">
643643
class protected_derived
644644
: protected <a href="#base">base</a>
645-
, protected excluded_base;
645+
, protected excluded_base
646646
</code>
647647
</pre>
648648
</div>

‎test-files/golden-tests/config/inherit-base-members/copy.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h3>Synopsis</h3>
4343
<pre>
4444
<code class="source-code cpp">
4545
class base
46-
: public <a href="#base_base">base_base</a>;
46+
: public <a href="#base_base">base_base</a>
4747
</code>
4848
</pre>
4949
</div>
@@ -420,7 +420,7 @@ <h3>Synopsis</h3>
420420
<code class="source-code cpp">
421421
class derived
422422
: public <a href="#base">base</a>
423-
, public excluded_base;
423+
, public excluded_base
424424
</code>
425425
</pre>
426426
</div>
@@ -772,7 +772,7 @@ <h3>Synopsis</h3>
772772
<code class="source-code cpp">
773773
class private_derived
774774
: <a href="#base">base</a>
775-
, excluded_base;
775+
, excluded_base
776776
</code>
777777
</pre>
778778
</div>
@@ -858,7 +858,7 @@ <h3>Synopsis</h3>
858858
<code class="source-code cpp">
859859
class protected_derived
860860
: protected <a href="#base">base</a>
861-
, protected excluded_base;
861+
, protected excluded_base
862862
</code>
863863
</pre>
864864
</div>

‎test-files/golden-tests/config/inherit-base-members/never.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h3>Synopsis</h3>
4343
<pre>
4444
<code class="source-code cpp">
4545
class base
46-
: public <a href="#base_base">base_base</a>;
46+
: public <a href="#base_base">base_base</a>
4747
</code>
4848
</pre>
4949
</div>
@@ -370,7 +370,7 @@ <h3>Synopsis</h3>
370370
<code class="source-code cpp">
371371
class derived
372372
: public <a href="#base">base</a>
373-
, public excluded_base;
373+
, public excluded_base
374374
</code>
375375
</pre>
376376
</div>
@@ -471,7 +471,7 @@ <h3>Synopsis</h3>
471471
<code class="source-code cpp">
472472
class private_derived
473473
: <a href="#base">base</a>
474-
, excluded_base;
474+
, excluded_base
475475
</code>
476476
</pre>
477477
</div>
@@ -557,7 +557,7 @@ <h3>Synopsis</h3>
557557
<code class="source-code cpp">
558558
class protected_derived
559559
: protected <a href="#base">base</a>
560-
, protected excluded_base;
560+
, protected excluded_base
561561
</code>
562562
</pre>
563563
</div>

‎test-files/golden-tests/config/inherit-base-members/reference.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h3>Synopsis</h3>
4343
<pre>
4444
<code class="source-code cpp">
4545
class base
46-
: public <a href="#base_base">base_base</a>;
46+
: public <a href="#base_base">base_base</a>
4747
</code>
4848
</pre>
4949
</div>
@@ -372,7 +372,7 @@ <h3>Synopsis</h3>
372372
<code class="source-code cpp">
373373
class derived
374374
: public <a href="#base">base</a>
375-
, public excluded_base;
375+
, public excluded_base
376376
</code>
377377
</pre>
378378
</div>
@@ -493,7 +493,7 @@ <h3>Synopsis</h3>
493493
<code class="source-code cpp">
494494
class private_derived
495495
: <a href="#base">base</a>
496-
, excluded_base;
496+
, excluded_base
497497
</code>
498498
</pre>
499499
</div>
@@ -579,7 +579,7 @@ <h3>Synopsis</h3>
579579
<code class="source-code cpp">
580580
class protected_derived
581581
: protected <a href="#base">base</a>
582-
, protected excluded_base;
582+
, protected excluded_base
583583
</code>
584584
</pre>
585585
</div>

0 commit comments

Comments
 (0)