Skip to content

Commit ca56d9a

Browse files
committed
escape variadic parameters
#fix fix #838
1 parent 007486b commit ca56d9a

21 files changed

+66
-66
lines changed

share/mrdocs/addons/generator/common/partials/symbol/signature/function.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{{/unless}}{{>type/declarator type decl-name=name~}}
2020
{{#if default}} = {{default}}{{/if~}}
2121
{{#unless @last}},{{/unless~}}
22-
{{/each~}}{{#if isVariadic}}{{#if params}}, {{/if}}...{{/if}})
22+
{{/each~}}{{#if isVariadic}}{{#if params}}, {{/if}}{{ str "..." }}{{/if}})
2323
{{~#if isConst}} const{{/if~}}
2424
{{#if isVolatile}} volatile{{/if~}}
2525
{{#if refQualifier}} {{refQualifier}}{{/if~}}

share/mrdocs/addons/generator/common/partials/symbol/signatures.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
{{> symbol/signature member link=member}}
2424
{{/markup/code-block}}
2525

26-
{{#> markup/span class="small" }}{{#> markup/a href=member.url }}{{#>markup/em }}» more...{{/markup/em}}{{/markup/a}}{{/markup/span}}
26+
{{#> markup/span class="small" }}{{#> markup/a href=member.url }}{{#>markup/em }}» more{{ str "..." }}{{/markup/em}}{{/markup/a}}{{/markup/span}}
2727

2828
{{/each}}
2929
{{/if}}

share/mrdocs/addons/generator/common/partials/template/arg.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
{{#if (and template (not nolink))}}{{#>markup/a href=template.url}}{{name}}{{/markup/a}}{{else~}}{{name~}}{{/if~}}
2323
{{/if~}}
2424
{{~#if is-pack~}}
25-
...
25+
{{ str "..." }}
2626
{{~/if~}}

share/mrdocs/addons/generator/common/partials/template/param.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
--}}
1616
{{#if (eq kind "type")~}}
1717
{{#if constraint}}{{>symbol/name-info constraint }}{{else}}{{key}}{{/if~}}
18-
{{#if is-pack}}...{{/if~}}
18+
{{#if is-pack}}{{ str "..." }}{{/if~}}
1919
{{#if name}} {{name}}{{/if~}}
2020
{{#if default}} = {{>template/arg default~}}{{/if~}}
2121
{{else if (eq kind "non-type")~}}
22-
{{>type/declarator type decl-name=name}}{{#if is-pack}}...{{/if~}}
22+
{{>type/declarator type decl-name=name}}{{#if is-pack}}{{ str "..." }}{{/if~}}
2323
{{#if default}} = {{>template/arg default~}}{{/if~}}
2424
{{else if (eq kind "template")~}}
25-
{{>template/head}} typename{{#if is-pack}}...{{/if~}}
25+
{{>template/head}} typename{{#if is-pack}}{{ str "..." }}{{/if~}}
2626
{{#if name}} {{name}}{{/if~}}
2727
{{#if default}} = {{>template/arg default~}}{{/if~}}
2828
{{/if}}

share/mrdocs/addons/generator/common/partials/type/declarator-prefix.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@
6060
{{~/if~}}
6161
{{#if is-pack~}}
6262
{{! Pack declarator prefix includes the ellipsis ~}}
63-
...
63+
{{ str "..." }}
6464
{{~/if}}

share/mrdocs/addons/generator/common/partials/type/declarator-suffix.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
{{~#unless @last}}, {{/unless~}}
3636
{{/each~}}
3737
{{! Include final "..." for variadic functions ~}}
38-
{{#if is-variadic}}{{#if param-types}}, {{/if}}...{{/if}}){{!~}}
38+
{{#if is-variadic}}{{#if param-types}}, {{/if}}{{ str "..." }}{{/if}}){{!~}}
3939
{{! cv-qualifiers as literal strings ~}}
4040
{{~#if cv-qualifiers}} {{cv-qualifiers}}{{/if~}}
4141
{{! Refqualifiers as "&" or "&&" ~}}

test-files/golden-tests/javadoc/brief-3.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@ void
2929
<<f-06,f>>(int);
3030
----
3131

32-
[.small]#<<f-06,_» more..._>>#
32+
[.small]#<<f-06,_» more&period;&period;&period;_>>#
3333

3434
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
3535
----
3636
void
3737
<<f-07,f>>(char const*);
3838
----
3939

40-
[.small]#<<f-07,_» more..._>>#
40+
[.small]#<<f-07,_» more&period;&period;&period;_>>#
4141

4242
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
4343
----
4444
void
4545
<<f-0f,f>>(double);
4646
----
4747

48-
[.small]#<<f-0f,_» more..._>>#
48+
[.small]#<<f-0f,_» more&period;&period;&period;_>>#
4949

5050
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
5151
----
5252
void
5353
<<f-0b,f>>(float const*);
5454
----
5555

56-
[.small]#<<f-0b,_» more..._>>#
56+
[.small]#<<f-0b,_» more&period;&period;&period;_>>#
5757

5858
[#f-06]
5959
== f

test-files/golden-tests/metadata/explicit-ctor.adoc

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,23 @@ explicit
5757
<<Explicit-2constructor-02,Explicit>>();
5858
----
5959

60-
[.small]#<<Explicit-2constructor-02,_» more..._>>#
60+
[.small]#<<Explicit-2constructor-02,_» more&period;&period;&period;_>>#
6161

6262
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
6363
----
6464
explicit
6565
<<Explicit-2constructor-00,Explicit>>(<<Explicit,Explicit>> const&);
6666
----
6767

68-
[.small]#<<Explicit-2constructor-00,_» more..._>>#
68+
[.small]#<<Explicit-2constructor-00,_» more&period;&period;&period;_>>#
6969

7070
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
7171
----
7272
explicit
7373
<<Explicit-2constructor-0b,Explicit>>(<<Explicit,Explicit>>&&) noexcept;
7474
----
7575

76-
[.small]#<<Explicit-2constructor-0b,_» more..._>>#
76+
[.small]#<<Explicit-2constructor-0b,_» more&period;&period;&period;_>>#
7777

7878
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
7979
----
@@ -83,7 +83,7 @@ explicit
8383
int);
8484
----
8585

86-
[.small]#<<Explicit-2constructor-03,_» more..._>>#
86+
[.small]#<<Explicit-2constructor-03,_» more&period;&period;&period;_>>#
8787

8888
[#Explicit-2constructor-02]
8989
== <<Explicit,Explicit>>::Explicit
@@ -188,23 +188,23 @@ explicit(B)
188188
<<ExplicitExpression-2constructor-0b,ExplicitExpression>>();
189189
----
190190

191-
[.small]#<<ExplicitExpression-2constructor-0b,_» more..._>>#
191+
[.small]#<<ExplicitExpression-2constructor-0b,_» more&period;&period;&period;_>>#
192192

193193
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
194194
----
195195
explicit(B)
196196
<<ExplicitExpression-2constructor-04,ExplicitExpression>>(<<ExplicitExpression,ExplicitExpression>> const&);
197197
----
198198

199-
[.small]#<<ExplicitExpression-2constructor-04,_» more..._>>#
199+
[.small]#<<ExplicitExpression-2constructor-04,_» more&period;&period;&period;_>>#
200200

201201
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
202202
----
203203
explicit(B)
204204
<<ExplicitExpression-2constructor-08,ExplicitExpression>>(<<ExplicitExpression,ExplicitExpression>>&&) noexcept;
205205
----
206206

207-
[.small]#<<ExplicitExpression-2constructor-08,_» more..._>>#
207+
[.small]#<<ExplicitExpression-2constructor-08,_» more&period;&period;&period;_>>#
208208

209209
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
210210
----
@@ -214,7 +214,7 @@ explicit(B)
214214
int);
215215
----
216216

217-
[.small]#<<ExplicitExpression-2constructor-027,_» more..._>>#
217+
[.small]#<<ExplicitExpression-2constructor-027,_» more&period;&period;&period;_>>#
218218

219219
[#ExplicitExpression-2constructor-0b]
220220
== <<ExplicitExpression,ExplicitExpression>>::ExplicitExpression
@@ -318,23 +318,23 @@ explicit(false)
318318
<<ExplicitFalse-2constructor-01,ExplicitFalse>>();
319319
----
320320

321-
[.small]#<<ExplicitFalse-2constructor-01,_» more..._>>#
321+
[.small]#<<ExplicitFalse-2constructor-01,_» more&period;&period;&period;_>>#
322322

323323
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
324324
----
325325
explicit(false)
326326
<<ExplicitFalse-2constructor-08,ExplicitFalse>>(<<ExplicitFalse,ExplicitFalse>> const&);
327327
----
328328

329-
[.small]#<<ExplicitFalse-2constructor-08,_» more..._>>#
329+
[.small]#<<ExplicitFalse-2constructor-08,_» more&period;&period;&period;_>>#
330330

331331
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
332332
----
333333
explicit(false)
334334
<<ExplicitFalse-2constructor-0a,ExplicitFalse>>(<<ExplicitFalse,ExplicitFalse>>&&) noexcept;
335335
----
336336

337-
[.small]#<<ExplicitFalse-2constructor-0a,_» more..._>>#
337+
[.small]#<<ExplicitFalse-2constructor-0a,_» more&period;&period;&period;_>>#
338338

339339
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
340340
----
@@ -344,7 +344,7 @@ explicit(false)
344344
int);
345345
----
346346

347-
[.small]#<<ExplicitFalse-2constructor-04f,_» more..._>>#
347+
[.small]#<<ExplicitFalse-2constructor-04f,_» more&period;&period;&period;_>>#
348348

349349
[#ExplicitFalse-2constructor-01]
350350
== <<ExplicitFalse,ExplicitFalse>>::ExplicitFalse
@@ -448,23 +448,23 @@ explicit(true)
448448
<<ExplicitTrue-2constructor-0d,ExplicitTrue>>();
449449
----
450450

451-
[.small]#<<ExplicitTrue-2constructor-0d,_» more..._>>#
451+
[.small]#<<ExplicitTrue-2constructor-0d,_» more&period;&period;&period;_>>#
452452

453453
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
454454
----
455455
explicit(true)
456456
<<ExplicitTrue-2constructor-04,ExplicitTrue>>(<<ExplicitTrue,ExplicitTrue>> const&);
457457
----
458458

459-
[.small]#<<ExplicitTrue-2constructor-04,_» more..._>>#
459+
[.small]#<<ExplicitTrue-2constructor-04,_» more&period;&period;&period;_>>#
460460

461461
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
462462
----
463463
explicit(true)
464464
<<ExplicitTrue-2constructor-08,ExplicitTrue>>(<<ExplicitTrue,ExplicitTrue>>&&) noexcept;
465465
----
466466

467-
[.small]#<<ExplicitTrue-2constructor-08,_» more..._>>#
467+
[.small]#<<ExplicitTrue-2constructor-08,_» more&period;&period;&period;_>>#
468468

469469
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
470470
----
@@ -474,7 +474,7 @@ explicit(true)
474474
int);
475475
----
476476

477-
[.small]#<<ExplicitTrue-2constructor-05,_» more..._>>#
477+
[.small]#<<ExplicitTrue-2constructor-05,_» more&period;&period;&period;_>>#
478478

479479
[#ExplicitTrue-2constructor-0d]
480480
== <<ExplicitTrue,ExplicitTrue>>::ExplicitTrue

test-files/golden-tests/metadata/explicit-object-parameter.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ auto&&
5656
<<Optional-value-05,value>>(this Self&& self);
5757
----
5858

59-
[.small]#<<Optional-value-05,_» more..._>>#
59+
[.small]#<<Optional-value-05,_» more&period;&period;&period;_>>#
6060

6161
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
6262
----
@@ -68,7 +68,7 @@ auto&&
6868
int x);
6969
----
7070

71-
[.small]#<<Optional-value-06,_» more..._>>#
71+
[.small]#<<Optional-value-06,_» more&period;&period;&period;_>>#
7272

7373
[#Optional-value-05]
7474
== <<Optional,Optional>>::value

test-files/golden-tests/metadata/function-template-template.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Declared in `&lt;function&hyphen;template&hyphen;template&period;cpp&gt;`
2525

2626
[source,cpp,subs="verbatim,replacements,macros,-callouts"]
2727
----
28-
template&lt;template&lt;class...&gt; typename ListType&gt;
28+
template&lt;template&lt;class&period;&period;&period;&gt; typename ListType&gt;
2929
constexpr
3030
void
3131
f(ListType&lt;int&gt; param);

0 commit comments

Comments
 (0)