Skip to content

Commit fe734b9

Browse files
committed
Use \opt{arg} instead of suffix \opt{}
This was machine-converted using sed -i 's/\([-a-z]\{1,\}\)\opt{}/\opt{\1}/g' *.tex sed -i 's/::\opt{}/\opt{::}/g' *.tex sed -i 's/\(\terminal{[^}]*}\)\opt{}/\opt{\1}/g' *.tex
1 parent 841ff67 commit fe734b9

17 files changed

+249
-249
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{:} \opt{member-specification}
204204
\end{ncbnftab}
205205

206206
An

source/basic.tex

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

688688
\begin{ncbnf}
689-
class-key attribute-specifier-seq\opt{} identifier \terminal{;}
689+
class-key \opt{attribute-specifier-seq} identifier \terminal{;}
690690
\end{ncbnf}
691691

692692
the \grammarterm{identifier} is declared to be a
@@ -1656,7 +1656,7 @@
16561656
\grammarterm{qualified-id} of the form:
16571657

16581658
\begin{ncbnf}
1659-
nested-name-specifier\opt{} class-name \terminal{::} \terminal{\tilde} class-name
1659+
\opt{nested-name-specifier} class-name \terminal{::} \terminal{\tilde} class-name
16601660
\end{ncbnf}
16611661

16621662
the second \grammarterm{class-name} is looked up in the same scope as the
@@ -2016,7 +2016,7 @@
20162016
following form:
20172017

20182018
\begin{ncbnf}
2019-
class-key attribute-specifier-seq\opt{} identifier \terminal{;}
2019+
class-key \opt{attribute-specifier-seq} identifier \terminal{;}
20202020
\end{ncbnf}
20212021

20222022
the \grammarterm{identifier} is looked up according
@@ -2031,7 +2031,7 @@
20312031
form:
20322032

20332033
\begin{ncbnf}
2034-
class-key attribute-specifier-seq\opt{} identifier \terminal{;}
2034+
class-key \opt{attribute-specifier-seq} identifier \terminal{;}
20352035
\end{ncbnf}
20362036

20372037
the \grammarterm{elaborated-type-specifier} is a declaration that
@@ -2197,7 +2197,7 @@
21972197

21982198
\begin{bnf}
21992199
\nontermdef{translation-unit}\br
2200-
declaration-seq\opt{}
2200+
\opt{declaration-seq}
22012201
\end{bnf}
22022202

22032203
\pnum

source/classes.tex

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@
2929

3030
\begin{bnf}
3131
\nontermdef{class-specifier}\br
32-
class-head \terminal{\{} member-specification\opt{} \terminal{\}}
32+
class-head \terminal{\{} \opt{member-specification} \terminal{\}}
3333
\end{bnf}
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 \opt{attribute-specifier-seq} class-head-name \opt{class-virt-specifier} \opt{base-clause}\br
38+
class-key \opt{attribute-specifier-seq} \opt{base-clause}
3939
\end{bnf}
4040

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

4646
\begin{bnf}
@@ -445,13 +445,13 @@
445445

446446
\begin{bnf}
447447
\nontermdef{member-specification}\br
448-
member-declaration member-specification\opt{}\br
449-
access-specifier \terminal{:} member-specification\opt{}
448+
member-declaration \opt{member-specification}\br
449+
access-specifier \terminal{:} \opt{member-specification}
450450
\end{bnf}
451451

452452
\begin{bnf}
453453
\nontermdef{member-declaration}\br
454-
attribute-specifier-seq\opt{} decl-specifier-seq\opt{} member-declarator-list\opt{} \terminal{;}\br
454+
\opt{attribute-specifier-seq} \opt{decl-specifier-seq} \opt{member-declarator-list} \terminal{;}\br
455455
function-definition\br
456456
using-declaration\br
457457
static_assert-declaration\br
@@ -469,9 +469,9 @@
469469

470470
\begin{bnf}
471471
\nontermdef{member-declarator}\br
472-
declarator virt-specifier-seq\opt{} pure-specifier\opt{}\br
473-
declarator brace-or-equal-initializer\opt{}\br
474-
identifier\opt{} attribute-specifier-seq\opt{} \terminal{:} constant-expression
472+
declarator \opt{virt-specifier-seq} \opt{pure-specifier}\br
473+
declarator \opt{brace-or-equal-initializer}\br
474+
\opt{identifier} \opt{attribute-specifier-seq} \terminal{:} constant-expression
475475
\end{bnf}
476476

477477
\begin{bnf}
@@ -1294,7 +1294,7 @@
12941294
A \grammarterm{member-declarator} of the form
12951295

12961296
\begin{ncbnftab}
1297-
identifier\opt{} attribute-specifier-seq\opt{} \terminal{:} constant-expression
1297+
\opt{identifier} \opt{attribute-specifier-seq} \terminal{:} constant-expression
12981298
\end{ncbnftab}
12991299

13001300
\indextext{\idxcode{:}!bit-field declaration}%

0 commit comments

Comments
 (0)