Skip to content

Commit dc21443

Browse files
committed
Replaces various non-copied *bnf* environments to match the usage of copied environments.
1 parent 5af09bf commit dc21443

11 files changed

Lines changed: 50 additions & 50 deletions

source/access.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@
199199
\grammarterm{access-specifier}
200200
(Clause~\ref{class.derived}):
201201

202-
\begin{ncbnftab}
202+
\begin{ncsimplebnf}
203203
access-specifier \terminal{:} member-specification\opt
204-
\end{ncbnftab}
204+
\end{ncsimplebnf}
205205

206206
An
207207
\grammarterm{access-specifier}

source/basic.tex

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -627,18 +627,18 @@
627627
\begin{itemize}
628628
\item for a declaration of the form
629629

630-
\begin{ncbnf}
630+
\begin{ncsimplebnf}
631631
class-key attribute-specifier-seq\opt identifier \terminal{;}
632-
\end{ncbnf}
632+
\end{ncsimplebnf}
633633

634634
the \grammarterm{identifier} is declared to be a
635635
\grammarterm{class-name} in the scope that contains the declaration,
636636
otherwise
637637
\item for an \grammarterm{elaborated-type-specifier} of the form
638638

639-
\begin{ncbnf}
639+
\begin{ncsimplebnf}
640640
class-key identifier
641-
\end{ncbnf}
641+
\end{ncsimplebnf}
642642

643643
if the
644644
\grammarterm{elaborated-type-specifier} is used in the
@@ -1619,9 +1619,9 @@
16191619
\grammarterm{nested-name-specifier}. Similarly, in a
16201620
\grammarterm{qualified-id} of the form:
16211621

1622-
\begin{ncbnf}
1622+
\begin{ncsimplebnf}
16231623
nested-name-specifier\opt class-name \terminal{::} \terminal{\tilde} class-name
1624-
\end{ncbnf}
1624+
\end{ncsimplebnf}
16251625

16261626
the second \grammarterm{class-name} is looked up in the same scope as the
16271627
first. \enterexample
@@ -1922,9 +1922,9 @@
19221922
\grammarterm{declarator-id} is a \grammarterm{qualified-id}, given that the
19231923
\grammarterm{qualified-id} for the namespace member has the form
19241924

1925-
\begin{ncbnf}
1925+
\begin{ncsimplebnf}
19261926
nested-name-specifier unqualified-id
1927-
\end{ncbnf}
1927+
\end{ncsimplebnf}
19281928

19291929
the
19301930
\grammarterm{unqualified-id} shall name a member of the namespace
@@ -1983,9 +1983,9 @@
19831983
\grammarterm{elaborated-type-specifier} appears in a declaration with the
19841984
following form:
19851985

1986-
\begin{ncbnf}
1986+
\begin{ncsimplebnf}
19871987
class-key attribute-specifier-seq\opt identifier \terminal{;}
1988-
\end{ncbnf}
1988+
\end{ncsimplebnf}
19891989

19901990
the \grammarterm{identifier} is looked up according
19911991
to~\ref{basic.lookup.unqual} but ignoring any non-type names that have
@@ -1998,9 +1998,9 @@
19981998
\grammarterm{elaborated-type-specifier} appears in a declaration with the
19991999
form:
20002000

2001-
\begin{ncbnf}
2001+
\begin{ncsimplebnf}
20022002
class-key attribute-specifier-seq\opt identifier \terminal{;}
2003-
\end{ncbnf}
2003+
\end{ncsimplebnf}
20042004

20052005
the \grammarterm{elaborated-type-specifier} is a declaration that
20062006
introduces the \grammarterm{class-name} as described

source/classes.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,9 +1227,9 @@
12271227
\indextext{\idxcode{union}!anonymous}%
12281228
A union of the form
12291229

1230-
\begin{ncbnftab}
1230+
\begin{ncsimplebnf}
12311231
\terminal{union} \terminal{\{} member-specification \terminal{\}} \terminal{;}
1232-
\end{ncbnftab}
1232+
\end{ncsimplebnf}
12331233

12341234
is called an \defn{anonymous union}; it defines an unnamed object of unnamed
12351235
type. The \grammarterm{member-specification} of an anonymous union shall
@@ -1321,9 +1321,9 @@
13211321
\pnum
13221322
A \grammarterm{member-declarator} of the form
13231323

1324-
\begin{ncbnftab}
1324+
\begin{ncsimplebnf}
13251325
identifier\opt attribute-specifier-seq\opt \terminal{:} constant-expression
1326-
\end{ncbnftab}
1326+
\end{ncsimplebnf}
13271327

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

source/declarators.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2190,9 +2190,9 @@
21902190
\pnum
21912191
A function definition of the form:
21922192

2193-
\begin{ncbnf}
2193+
\begin{ncsimplebnf}
21942194
attribute-specifier-seq\opt decl-specifier-seq\opt declarator virt-specifier-seq\opt \terminal{ = default ;}
2195-
\end{ncbnf}
2195+
\end{ncsimplebnf}
21962196

21972197
is called an \grammarterm{explicitly-defaulted} definition.
21982198
A function that is explicitly defaulted shall
@@ -2292,9 +2292,9 @@
22922292
\pnum
22932293
A function definition of the form:
22942294

2295-
\begin{ncbnf}
2295+
\begin{ncsimplebnf}
22962296
attribute-specifier-seq\opt decl-specifier-seq\opt declarator virt-specifier-seq\opt \terminal{ = delete ;}
2297-
\end{ncbnf}
2297+
\end{ncsimplebnf}
22982298

22992299
is called a \term{deleted definition}. A function with a
23002300
deleted definition is also called a \term{deleted function}.

source/expressions.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,9 +1531,9 @@
15311531
the two \grammarterm{type-name}{s} in a \grammarterm{pseudo-destructor-name} of
15321532
the form
15331533

1534-
\begin{ncbnf}
1534+
\begin{ncsimplebnf}
15351535
nested-name-specifier\opt type-name \terminal{::\,\tilde} type-name
1536-
\end{ncbnf}
1536+
\end{ncsimplebnf}
15371537

15381538
shall designate the same scalar type.
15391539

source/intro.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,9 @@
439439
An optional terminal or non-terminal symbol is indicated by the subscript
440440
``\opt'', so
441441

442-
\begin{ncbnf}
442+
\begin{ncsimplebnf}
443443
\terminal{\{} expression\opt \terminal{\}}
444-
\end{ncbnf}
444+
\end{ncsimplebnf}
445445

446446
indicates an optional expression enclosed in braces.%
447447

source/lex.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@
345345
parenthesis is identified. The raw string literal is defined as the shortest sequence
346346
of characters that matches the raw-string pattern
347347

348-
\begin{ncbnf}
348+
\begin{ncsimplebnf}
349349
encoding-prefix\opt \terminal{R} raw-string
350-
\end{ncbnf}
350+
\end{ncsimplebnf}
351351

352352
\item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
353353
is neither \tcode{:} nor \tcode{>}, the \tcode{<} is treated as a preprocessor token by

source/overloading.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -845,9 +845,9 @@
845845
\grammarterm{call-function}
846846
and having the form
847847

848-
\begin{ncbnf}
848+
\begin{ncsimplebnf}
849849
\terminal{R} call-function \terminal{(} conversion-type-id \terminal{F, P1 a1, ... ,Pn an)} \terminal{\{ return F (a1,... ,an); \}}
850-
\end{ncbnf}
850+
\end{ncsimplebnf}
851851

852852
is also considered as a candidate function.
853853
Similarly, surrogate

source/preprocessor.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@
195195
there simply are no keywords, enumeration constants, etc.}
196196
and it may contain unary operator expressions of the form
197197

198-
\begin{ncbnf}
198+
\begin{ncsimplebnf}
199199
\terminal{defined} identifier
200-
\end{ncbnf}
200+
\end{ncsimplebnf}
201201

202202
or
203203

204-
\begin{ncbnf}
204+
\begin{ncsimplebnf}
205205
\terminal{defined (} identifier \terminal{)}
206-
\end{ncbnf}
206+
\end{ncsimplebnf}
207207

208208
which evaluate to
209209
\tcode{1}
@@ -1307,9 +1307,9 @@
13071307

13081308
A unary operator expression of the form:
13091309

1310-
\begin{ncbnf}
1310+
\begin{ncsimplebnf}
13111311
\terminal{_Pragma} \terminal{(} string-literal \terminal{)}
1312-
\end{ncbnf}
1312+
\end{ncsimplebnf}
13131313

13141314
is processed as follows: The string literal is \term{destringized}
13151315
by deleting the \tcode{L} prefix, if present, deleting the leading and trailing

source/special.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
Constructors do not have names.
7878
A declaration of a constructor uses a function declarator~(\ref{dcl.fct}) of the form
7979

80-
\begin{ncbnf}
80+
\begin{ncsimplebnf}
8181
ptr-declarator \terminal{(} parameter-declaration-clause \terminal{)} exception-specification\opt attribute-specifier-seq\opt
82-
\end{ncbnf}
82+
\end{ncsimplebnf}
8383

8484
where the \grammarterm{ptr-declarator} consists solely of an
8585
\grammarterm{id-expression}, an optional \grammarterm{attribute-specifier-seq},
@@ -875,9 +875,9 @@
875875
\pnum
876876
A declaration of a destructor uses a function declarator~(\ref{dcl.fct}) of the form
877877

878-
\begin{ncbnf}
878+
\begin{ncsimplebnf}
879879
ptr-declarator \terminal{(} parameter-declaration-clause \terminal{)} exception-specification\opt attribute-specifier-seq\opt
880-
\end{ncbnf}
880+
\end{ncsimplebnf}
881881

882882
where the \grammarterm{ptr-declarator} consists solely of an
883883
\grammarterm{id-expression}, an optional \grammarterm{attribute-specifier-seq},

0 commit comments

Comments
 (0)