Skip to content

Commit 5a2ff92

Browse files
AlisdairMtkoeppe
authored andcommitted
P3340R0 A Consistent Grammar For Sequences
1 parent 9e41261 commit 5a2ff92

File tree

6 files changed

+20
-39
lines changed

6 files changed

+20
-39
lines changed

source/classes.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,7 @@
492492

493493
\begin{bnf}
494494
\nontermdef{virt-specifier-seq}\br
495-
virt-specifier\br
496-
virt-specifier-seq virt-specifier
495+
virt-specifier \opt{virt-specifier-seq}
497496
\end{bnf}
498497

499498
\begin{bnf}

source/declarations.tex

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
the form
1414
\begin{bnf}
1515
\nontermdef{declaration-seq}\br
16-
declaration\br
17-
declaration-seq declaration
16+
declaration \opt{declaration-seq}
1817
\end{bnf}
1918

2019
\begin{bnf}
@@ -8724,7 +8723,7 @@
87248723

87258724
\begin{bnf}
87268725
\nontermdef{attribute-specifier-seq}\br
8727-
\opt{attribute-specifier-seq} attribute-specifier
8726+
attribute-specifier \opt{attribute-specifier-seq}
87288727
\end{bnf}
87298728

87308729
\begin{bnf}
@@ -8780,8 +8779,7 @@
87808779

87818780
\begin{bnf}
87828781
\nontermdef{balanced-token-seq}\br
8783-
balanced-token\br
8784-
balanced-token-seq balanced-token
8782+
balanced-token \opt{balanced-token-seq}
87858783
\end{bnf}
87868784

87878785
\begin{bnf}

source/expressions.tex

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1846,8 +1846,7 @@
18461846

18471847
\begin{bnf}
18481848
\nontermdef{lambda-specifier-seq}\br
1849-
lambda-specifier\br
1850-
lambda-specifier lambda-specifier-seq
1849+
lambda-specifier \opt{lambda-specifier-seq}
18511850
\end{bnf}
18521851

18531852
\pnum
@@ -2896,8 +2895,7 @@
28962895

28972896
\begin{bnf}
28982897
\nontermdef{requirement-seq}\br
2899-
requirement\br
2900-
requirement requirement-seq
2898+
requirement \opt{requirement-seq}
29012899
\end{bnf}
29022900

29032901
\begin{bnf}

source/lex.tex

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,7 @@
398398

399399
\begin{bnf}
400400
\nontermdef{n-char-sequence}\br
401-
n-char\br
402-
n-char-sequence n-char
401+
n-char \opt{n-char-sequence}
403402
\end{bnf}
404403

405404
\begin{bnf}
@@ -414,8 +413,7 @@
414413

415414
\begin{bnf}
416415
\nontermdef{simple-hexadecimal-digit-sequence}\br
417-
hexadecimal-digit\br
418-
simple-hexadecimal-digit-sequence hexadecimal-digit
416+
hexadecimal-digit \opt{simple-hexadecimal-digit-sequence}
419417
\end{bnf}
420418

421419
\begin{bnf}
@@ -642,8 +640,7 @@
642640

643641
\begin{bnf}
644642
\nontermdef{h-char-sequence}\br
645-
h-char\br
646-
h-char-sequence h-char
643+
h-char \opt{h-char-sequence}
647644
\end{bnf}
648645

649646
\begin{bnf}
@@ -653,8 +650,7 @@
653650

654651
\begin{bnf}
655652
\nontermdef{q-char-sequence}\br
656-
q-char\br
657-
q-char-sequence q-char
653+
q-char \opt{q-char-sequence}
658654
\end{bnf}
659655

660656
\begin{bnf}
@@ -1377,8 +1373,7 @@
13771373

13781374
\begin{bnf}
13791375
\nontermdef{c-char-sequence}\br
1380-
c-char\br
1381-
c-char-sequence c-char
1376+
c-char \opt{c-char-sequence}
13821377
\end{bnf}
13831378

13841379
\begin{bnf}
@@ -1419,8 +1414,7 @@
14191414

14201415
\begin{bnf}
14211416
\nontermdef{simple-octal-digit-sequence}\br
1422-
octal-digit\br
1423-
simple-octal-digit-sequence octal-digit
1417+
octal-digit \opt{simple-octal-digit-sequence}
14241418
\end{bnf}
14251419

14261420
\begin{bnf}
@@ -1748,8 +1742,7 @@
17481742

17491743
\begin{bnf}
17501744
\nontermdef{s-char-sequence}\br
1751-
s-char\br
1752-
s-char-sequence s-char
1745+
s-char \opt{s-char-sequence}
17531746
\end{bnf}
17541747

17551748
\begin{bnf}
@@ -1772,8 +1765,7 @@
17721765

17731766
\begin{bnf}
17741767
\nontermdef{r-char-sequence}\br
1775-
r-char\br
1776-
r-char-sequence r-char
1768+
r-char \opt{r-char-sequence}
17771769
\end{bnf}
17781770

17791771
\begin{bnf}
@@ -1784,8 +1776,7 @@
17841776

17851777
\begin{bnf}
17861778
\nontermdef{d-char-sequence}\br
1787-
d-char\br
1788-
d-char-sequence d-char
1779+
d-char\opt{d-char-sequence}
17891780
\end{bnf}
17901781

17911782
\begin{bnf}

source/preprocessor.tex

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@
7575

7676
\begin{bnf}
7777
\nontermdef{elif-groups}\br
78-
elif-group\br
79-
elif-groups elif-group
78+
elif-group \opt{elif-groups}
8079
\end{bnf}
8180

8281
\begin{bnf}\obeyspaces
@@ -124,8 +123,7 @@
124123

125124
\begin{bnf}
126125
\nontermdef{pp-tokens}\br
127-
preprocessing-token\br
128-
pp-tokens preprocessing-token
126+
preprocessing-token \opt{pp-tokens}
129127
\end{bnf}
130128

131129
\begin{bnf}
@@ -300,8 +298,7 @@
300298

301299
\begin{bnf}
302300
\nontermdef{h-pp-tokens}\br
303-
h-preprocessing-token\br
304-
h-pp-tokens h-preprocessing-token
301+
h-preprocessing-token \opt{h-pp-tokens}
305302
\end{bnf}
306303

307304
\begin{bnf}

source/statements.tex

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,12 @@
226226

227227
\begin{bnf}
228228
\nontermdef{statement-seq}\br
229-
statement\br
230-
statement-seq statement
229+
statement \opt{statement-seq}
231230
\end{bnf}
232231

233232
\begin{bnf}
234233
\nontermdef{label-seq}\br
235-
label\br
236-
label-seq label
234+
label \opt{label-seq}
237235
\end{bnf}
238236

239237
A label at the end of a \grammarterm{compound-statement}

0 commit comments

Comments
 (0)