Skip to content

Commit e26f274

Browse files
committed
Replace \opt with \opt{}
1 parent d9c0064 commit e26f274

15 files changed

+188
-188
lines changed

source/access.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
(Clause~\ref{class.derived}):
201201

202202
\begin{ncbnftab}
203-
access-specifier \terminal{:} member-specification\opt
203+
access-specifier \terminal{:} member-specification\opt{}
204204
\end{ncbnftab}
205205

206206
An

source/basic.tex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@
687687
\item for a declaration of the form
688688

689689
\begin{ncbnf}
690-
class-key attribute-specifier-seq\opt identifier \terminal{;}
690+
class-key attribute-specifier-seq\opt{} identifier \terminal{;}
691691
\end{ncbnf}
692692

693693
the \grammarterm{identifier} is declared to be a
@@ -1664,7 +1664,7 @@
16641664
\grammarterm{qualified-id} of the form:
16651665

16661666
\begin{ncbnf}
1667-
nested-name-specifier\opt class-name \terminal{::} \terminal{\tilde} class-name
1667+
nested-name-specifier\opt{} class-name \terminal{::} \terminal{\tilde} class-name
16681668
\end{ncbnf}
16691669

16701670
the second \grammarterm{class-name} is looked up in the same scope as the
@@ -2024,7 +2024,7 @@
20242024
following form:
20252025

20262026
\begin{ncbnf}
2027-
class-key attribute-specifier-seq\opt identifier \terminal{;}
2027+
class-key attribute-specifier-seq\opt{} identifier \terminal{;}
20282028
\end{ncbnf}
20292029

20302030
the \grammarterm{identifier} is looked up according
@@ -2039,7 +2039,7 @@
20392039
form:
20402040

20412041
\begin{ncbnf}
2042-
class-key attribute-specifier-seq\opt identifier \terminal{;}
2042+
class-key attribute-specifier-seq\opt{} identifier \terminal{;}
20432043
\end{ncbnf}
20442044

20452045
the \grammarterm{elaborated-type-specifier} is a declaration that
@@ -2205,7 +2205,7 @@
22052205

22062206
\begin{bnf}
22072207
\nontermdef{translation-unit}\br
2208-
declaration-seq\opt
2208+
declaration-seq\opt{}
22092209
\end{bnf}
22102210

22112211
\pnum

source/classes.tex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434

3535
\begin{bnf}
3636
\nontermdef{class-head}\br
37-
class-key attribute-specifier-seq\opt class-head-name class-virt-specifier\opt base-clause\opt\br
38-
class-key attribute-specifier-seq\opt base-clause\opt
37+
class-key attribute-specifier-seq\opt{} class-head-name class-virt-specifier\opt{} base-clause\opt{}\br
38+
class-key attribute-specifier-seq\opt{} base-clause\opt{}
3939
\end{bnf}
4040

4141
\begin{bnf}
4242
\nontermdef{class-head-name}\br
43-
nested-name-specifier\opt class-name
43+
nested-name-specifier\opt{} class-name
4444
\end{bnf}
4545

4646
\begin{bnf}
@@ -441,13 +441,13 @@
441441

442442
\begin{bnf}
443443
\nontermdef{member-specification}\br
444-
member-declaration member-specification\opt\br
445-
access-specifier \terminal{:} member-specification\opt
444+
member-declaration member-specification\opt{}\br
445+
access-specifier \terminal{:} member-specification\opt{}
446446
\end{bnf}
447447

448448
\begin{bnf}
449449
\nontermdef{member-declaration}\br
450-
attribute-specifier-seq\opt decl-specifier-seq\opt member-declarator-list\opt{} \terminal{;}\br
450+
attribute-specifier-seq\opt{} decl-specifier-seq\opt{} member-declarator-list\opt{} \terminal{;}\br
451451
function-definition\br
452452
using-declaration\br
453453
static_assert-declaration\br
@@ -465,9 +465,9 @@
465465

466466
\begin{bnf}
467467
\nontermdef{member-declarator}\br
468-
declarator virt-specifier-seq\opt pure-specifier\opt\br
468+
declarator virt-specifier-seq\opt{} pure-specifier\opt{}\br
469469
declarator requires-clause\br
470-
declarator brace-or-equal-initializer\opt\br
470+
declarator brace-or-equal-initializer\opt{}\br
471471
identifier\opt{} attribute-specifier-seq\opt{} \terminal{:} constant-expression brace-or-equal-initializer\opt{}
472472
\end{bnf}
473473

source/declarations.tex

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
\begin{bnf}
4747
\nontermdef{nodeclspec-function-declaration}\br
48-
attribute-specifier-seq\opt declarator \terminal{;}
48+
attribute-specifier-seq\opt{} declarator \terminal{;}
4949
\end{bnf}
5050

5151
\begin{bnf}
@@ -57,7 +57,7 @@
5757
\nontermdef{simple-declaration}\br
5858
decl-specifier-seq init-declarator-list\opt{} \terminal{;}\br
5959
attribute-specifier-seq decl-specifier-seq init-declarator-list \terminal{;}\br
60-
attribute-specifier-seq\opt decl-specifier-seq ref-qualifier\opt{} \terminal{[} identifier-list \terminal{]} initializer \terminal{;}
60+
attribute-specifier-seq\opt{} decl-specifier-seq ref-qualifier\opt{} \terminal{[} identifier-list \terminal{]} initializer \terminal{;}
6161
\end{bnf}
6262

6363
\begin{bnf}
@@ -93,7 +93,7 @@
9393
\grammarterm{nodeclspec-function-declaration} of the form
9494

9595
\begin{ncsimplebnf}
96-
attribute-specifier-seq\opt decl-specifier-seq\opt init-declarator-list\opt{} \terminal{;}
96+
attribute-specifier-seq\opt{} decl-specifier-seq\opt{} init-declarator-list\opt{} \terminal{;}
9797
\end{ncsimplebnf}
9898

9999
is divided into three parts.
@@ -259,7 +259,7 @@
259259

260260
\begin{bnf}
261261
\nontermdef{decl-specifier-seq}\br
262-
decl-specifier attribute-specifier-seq\opt\br
262+
decl-specifier attribute-specifier-seq\opt{}\br
263263
decl-specifier decl-specifier-seq
264264
\end{bnf}
265265

@@ -1035,7 +1035,7 @@
10351035

10361036
\begin{bnf}
10371037
\nontermdef{type-specifier-seq}\br
1038-
type-specifier attribute-specifier-seq\opt\br
1038+
type-specifier attribute-specifier-seq\opt{}\br
10391039
type-specifier type-specifier-seq
10401040
\end{bnf}
10411041

@@ -1048,7 +1048,7 @@
10481048

10491049
\begin{bnf}
10501050
\nontermdef{defining-type-specifier-seq}\br
1051-
defining-type-specifier attribute-specifier-seq\opt\br
1051+
defining-type-specifier attribute-specifier-seq\opt{}\br
10521052
defining-type-specifier defining-type-specifier-seq
10531053
\end{bnf}
10541054

@@ -1225,9 +1225,9 @@
12251225

12261226
\begin{bnf}
12271227
\nontermdef{simple-type-specifier}\br
1228-
nested-name-specifier\opt type-name\br
1228+
nested-name-specifier\opt{} type-name\br
12291229
nested-name-specifier \terminal{template} simple-template-id\br
1230-
nested-name-specifier\opt template-name\br
1230+
nested-name-specifier\opt{} template-name\br
12311231
\terminal{char}\br
12321232
\terminal{char16_t}\br
12331233
\terminal{char32_t}\br
@@ -1459,10 +1459,10 @@
14591459

14601460
\begin{bnf}
14611461
\nontermdef{elaborated-type-specifier}\br
1462-
class-key attribute-specifier-seq\opt nested-name-specifier\opt identifier\br
1462+
class-key attribute-specifier-seq\opt{} nested-name-specifier\opt{} identifier\br
14631463
class-key simple-template-id\br
1464-
class-key nested-name-specifier \terminal{template}\opt simple-template-id\br
1465-
\terminal{enum} nested-name-specifier\opt identifier
1464+
class-key nested-name-specifier \terminal{template}\opt{} simple-template-id\br
1465+
\terminal{enum} nested-name-specifier\opt{} identifier
14661466
\end{bnf}
14671467

14681468
\pnum
@@ -1477,11 +1477,11 @@
14771477
forms:
14781478

14791479
\begin{ncsimplebnf}
1480-
class-key attribute-specifier-seq\opt identifier \terminal{;}\br
1481-
\terminal{friend} class-key \terminal{::\opt} identifier \terminal{;}\br
1482-
\terminal{friend} class-key \terminal{::\opt} simple-template-id \terminal{;}\br
1480+
class-key attribute-specifier-seq\opt{} identifier \terminal{;}\br
1481+
\terminal{friend} class-key \terminal{::\opt{}} identifier \terminal{;}\br
1482+
\terminal{friend} class-key \terminal{::\opt{}} simple-template-id \terminal{;}\br
14831483
\terminal{friend} class-key nested-name-specifier identifier \terminal{;}\br
1484-
\terminal{friend} class-key nested-name-specifier \terminal{template\opt} simple-template-id \terminal{;}
1484+
\terminal{friend} class-key nested-name-specifier \terminal{template\opt{}} simple-template-id \terminal{;}
14851485
\end{ncsimplebnf}
14861486

14871487
In the first case, the \grammarterm{attribute-specifier-seq}, if any, appertains
@@ -1912,17 +1912,17 @@
19121912

19131913
\begin{bnf}
19141914
\nontermdef{enum-head}\br
1915-
enum-key attribute-specifier-seq\opt enum-head-name\opt enum-base\opt
1915+
enum-key attribute-specifier-seq\opt{} enum-head-name\opt{} enum-base\opt{}
19161916
\end{bnf}
19171917

19181918
\begin{bnf}
19191919
\nontermdef{enum-head-name}\br
1920-
nested-name-specifier\opt identifier
1920+
nested-name-specifier\opt{} identifier
19211921
\end{bnf}
19221922

19231923
\begin{bnf}
19241924
\nontermdef{opaque-enum-declaration}\br
1925-
enum-key attribute-specifier-seq\opt nested-name-specifier\opt identifier enum-base\opt{} \terminal{;}
1925+
enum-key attribute-specifier-seq\opt{} nested-name-specifier\opt{} identifier enum-base\opt{} \terminal{;}
19261926
\end{bnf}
19271927

19281928
\begin{bnf}
@@ -1951,7 +1951,7 @@
19511951

19521952
\begin{bnf}
19531953
\nontermdef{enumerator}\br
1954-
identifier attribute-specifier-seq\opt
1954+
identifier attribute-specifier-seq\opt{}
19551955
\end{bnf}
19561956

19571957
The optional \grammarterm{attribute-specifier-seq} in the \grammarterm{enum-head} and
@@ -2260,12 +2260,12 @@
22602260

22612261
\begin{bnf}
22622262
\nontermdef{named-namespace-definition}\br
2263-
\terminal{inline\opt} \terminal{namespace} attribute-specifier-seq\opt identifier \terminal{\{} namespace-body \terminal{\}}
2263+
\terminal{inline\opt{}} \terminal{namespace} attribute-specifier-seq\opt{} identifier \terminal{\{} namespace-body \terminal{\}}
22642264
\end{bnf}
22652265

22662266
\begin{bnf}
22672267
\nontermdef{unnamed-namespace-definition}\br
2268-
\terminal{inline\opt} \terminal{namespace} attribute-specifier-seq\opt{} \terminal{\{} namespace-body \terminal{\}}
2268+
\terminal{inline\opt{}} \terminal{namespace} attribute-specifier-seq\opt{} \terminal{\{} namespace-body \terminal{\}}
22692269
\end{bnf}
22702270

22712271
\begin{bnf}
@@ -2281,7 +2281,7 @@
22812281

22822282
\begin{bnf}
22832283
\nontermdef{namespace-body}\br
2284-
declaration-seq\opt
2284+
declaration-seq\opt{}
22852285
\end{bnf}
22862286

22872287
\pnum
@@ -2592,7 +2592,7 @@
25922592

25932593
\begin{bnf}
25942594
\nontermdef{qualified-namespace-specifier}\br
2595-
nested-name-specifier\opt namespace-name
2595+
nested-name-specifier\opt{} namespace-name
25962596
\end{bnf}
25972597

25982598
\pnum
@@ -2632,13 +2632,13 @@
26322632

26332633
\begin{bnf}
26342634
\nontermdef{using-declarator-list}\br
2635-
using-declarator \terminal{...}\opt\br
2636-
using-declarator-list \terminal{,} using-declarator \terminal{...}\opt
2635+
using-declarator \terminal{...}\opt{}\br
2636+
using-declarator-list \terminal{,} using-declarator \terminal{...}\opt{}
26372637
\end{bnf}
26382638

26392639
\begin{bnf}
26402640
\nontermdef{using-declarator}\br
2641-
\terminal{typename\opt} nested-name-specifier unqualified-id
2641+
\terminal{typename\opt{}} nested-name-specifier unqualified-id
26422642
\end{bnf}
26432643

26442644
\pnum
@@ -3112,7 +3112,7 @@
31123112

31133113
\begin{bnf}
31143114
\nontermdef{using-directive}\br
3115-
attribute-specifier-seq\opt{} \terminal{using namespace} nested-name-specifier\opt namespace-name \terminal{;}
3115+
attribute-specifier-seq\opt{} \terminal{using namespace} nested-name-specifier\opt{} namespace-name \terminal{;}
31163116
\end{bnf}
31173117

31183118
\pnum
@@ -3587,7 +3587,7 @@
35873587

35883588
\begin{bnf}
35893589
\nontermdef{attribute-specifier-seq}\br
3590-
attribute-specifier-seq\opt attribute-specifier
3590+
attribute-specifier-seq\opt{} attribute-specifier
35913591
\end{bnf}
35923592

35933593
\begin{bnf}
@@ -3609,15 +3609,15 @@
36093609

36103610
\begin{bnf}
36113611
\nontermdef{attribute-list}\br
3612-
attribute\opt\br
3613-
attribute-list \terminal{,} attribute\opt\br
3612+
attribute\opt{}\br
3613+
attribute-list \terminal{,} attribute\opt{}\br
36143614
attribute \terminal{...}\br
36153615
attribute-list \terminal{,} attribute \terminal{...}
36163616
\end{bnf}
36173617

36183618
\begin{bnf}
36193619
\nontermdef{attribute}\br
3620-
attribute-token attribute-argument-clause\opt
3620+
attribute-token attribute-argument-clause\opt{}
36213621
\end{bnf}
36223622

36233623
\begin{bnf}

0 commit comments

Comments
 (0)