Skip to content

Commit 4e55d84

Browse files
EelisEelis
committed
Use cxxdraft-htmlgen macros to annotate non-C++ code and literal fragments.
1 parent cf68372 commit 4e55d84

File tree

3 files changed

+318
-318
lines changed

3 files changed

+318
-318
lines changed

‎source/exceptions.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@
135135
Any exception thrown while destroying
136136
\tcode{t2}
137137
will result in executing
138-
\tcode{handler 2};
138+
\noncxxtcode{handler 2};
139139
any exception thrown while destroying
140140
\tcode{t1}
141141
will result in executing
142-
\tcode{handler 1}.
142+
\noncxxtcode{handler 1}.
143143
\end{example}
144144

145145
\pnum

‎source/lex.tex

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -555,15 +555,15 @@
555555
\item
556556
\indextext{literal!string!raw}%
557557
If the next character begins a sequence of characters that could be the prefix
558-
and initial double quote of a raw string literal, such as \tcode{R"}, the next preprocessing
558+
and initial double quote of a raw string literal, such as \literaltcode{R"}, the next preprocessing
559559
token shall be a raw string literal. Between the initial and final
560560
double quote characters of the raw string, any transformations performed in phase
561561
2 (line splicing) are reverted; this reversion
562562
shall apply before any \grammarterm{d-char}, \grammarterm{r-char}, or delimiting
563563
parenthesis is identified. The raw string literal is defined as the shortest sequence
564564
of characters that matches the raw-string pattern
565565
\begin{ncbnf}
566-
\opt{encoding-prefix} \terminal{R} raw-string
566+
\opt{encoding-prefix} \literalterminal{R} raw-string
567567
\end{ncbnf}
568568

569569
\item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
@@ -693,15 +693,15 @@
693693
\begin{bnf}
694694
\nontermdef{pp-number}\br
695695
digit\br
696-
\terminal{.} digit\br
696+
\literalterminal{.} digit\br
697697
pp-number identifier-continue\br
698-
pp-number \terminal{'} digit\br
699-
pp-number \terminal{'} nondigit\br
700-
pp-number \terminal{e} sign\br
701-
pp-number \terminal{E} sign\br
702-
pp-number \terminal{p} sign\br
703-
pp-number \terminal{P} sign\br
704-
pp-number \terminal{.}
698+
pp-number \literalterminal{'} digit\br
699+
pp-number \literalterminal{'} nondigit\br
700+
pp-number \literalterminal{e} sign\br
701+
pp-number \literalterminal{E} sign\br
702+
pp-number \literalterminal{p} sign\br
703+
pp-number \literalterminal{P} sign\br
704+
pp-number \literalterminal{.}
705705
\end{bnf}
706706

707707
\pnum
@@ -1123,19 +1123,19 @@
11231123
\nontermdef{binary-literal}\br
11241124
\terminal{0b} binary-digit\br
11251125
\terminal{0B} binary-digit\br
1126-
binary-literal \opt{\terminal{'}} binary-digit
1126+
binary-literal \opt{\literalterminal{'}} binary-digit
11271127
\end{bnf}
11281128

11291129
\begin{bnf}
11301130
\nontermdef{octal-literal}\br
11311131
\terminal{0}\br
1132-
octal-literal \opt{\terminal{'}} octal-digit
1132+
octal-literal \opt{\literalterminal{'}} octal-digit
11331133
\end{bnf}
11341134

11351135
\begin{bnf}
11361136
\nontermdef{decimal-literal}\br
11371137
nonzero-digit\br
1138-
decimal-literal \opt{\terminal{'}} digit
1138+
decimal-literal \opt{\literalterminal{'}} digit
11391139
\end{bnf}
11401140

11411141
\begin{bnf}
@@ -1166,14 +1166,14 @@
11661166
\begin{bnf}
11671167
\nontermdef{hexadecimal-digit-sequence}\br
11681168
hexadecimal-digit\br
1169-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1169+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
11701170
\end{bnf}
11711171

11721172
\begin{bnf}
11731173
\nontermdef{hexadecimal-digit} \textnormal{one of}\br
1174-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
1175-
\terminal{a b c d e f}\br
1176-
\terminal{A B C D E F}
1174+
\literalterminal{0 1 2 3 4 5 6 7 8 9}\br
1175+
\literalterminal{a b c d e f}\br
1176+
\literalterminal{A B C D E F}
11771177
\end{bnf}
11781178

11791179
\begin{bnf}
@@ -1188,17 +1188,17 @@
11881188

11891189
\begin{bnf}
11901190
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1191-
\terminal{u U}
1191+
\literalterminal{u U}
11921192
\end{bnf}
11931193

11941194
\begin{bnf}
11951195
\nontermdef{long-suffix} \textnormal{one of}\br
1196-
\terminal{l L}
1196+
\literalterminal{l L}
11971197
\end{bnf}
11981198

11991199
\begin{bnf}
12001200
\nontermdef{long-long-suffix} \textnormal{one of}\br
1201-
\terminal{ll LL}
1201+
\literalterminal{ll LL}
12021202
\end{bnf}
12031203

12041204
\begin{bnf}
@@ -1237,7 +1237,7 @@
12371237

12381238
\pnum
12391239
The \grammarterm{hexadecimal-digit}s
1240-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1240+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
12411241
have decimal values ten through fifteen.
12421242
\begin{example}
12431243
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1281,7 +1281,7 @@
12811281
&
12821282
&
12831283
\tcode{unsigned long long int}\\\hline
1284-
\tcode{u} or \tcode{U} &
1284+
\literaltcode{u} or \literaltcode{U} &
12851285
\tcode{unsigned int} &
12861286
\tcode{unsigned int}\\
12871287
&
@@ -1290,7 +1290,7 @@
12901290
&
12911291
\tcode{unsigned long long int} &
12921292
\tcode{unsigned long long int}\\\hline
1293-
\tcode{l} or \tcode{L} &
1293+
\literaltcode{l} or \literaltcode{L} &
12941294
\tcode{long int} &
12951295
\tcode{long int}\\
12961296
&
@@ -1302,22 +1302,22 @@
13021302
&
13031303
&
13041304
\tcode{unsigned long long int}\\\hline
1305-
Both \tcode{u} or \tcode{U} &
1305+
Both \literaltcode{u} or \literaltcode{U} &
13061306
\tcode{unsigned long int} &
13071307
\tcode{unsigned long int}\\
1308-
and \tcode{l} or \tcode{L} &
1308+
and \literaltcode{l} or \literaltcode{L} &
13091309
\tcode{unsigned long long int} &
13101310
\tcode{unsigned long long int}\\\hline
1311-
\tcode{ll} or \tcode{LL} &
1311+
\literaltcode{ll} or \literaltcode{LL} &
13121312
\tcode{long long int} &
13131313
\tcode{long long int}\\
13141314
&
13151315
&
13161316
\tcode{unsigned long long int}\\\hline
1317-
Both \tcode{u} or \tcode{U} &
1317+
Both \literaltcode{u} or \literaltcode{U} &
13181318
\tcode{unsigned long long int} &
13191319
\tcode{unsigned long long int}\\
1320-
and \tcode{ll} or \tcode{LL} &
1320+
and \literaltcode{ll} or \literaltcode{LL} &
13211321
&
13221322
\\\hline
13231323
\tcode{z} or \tcode{Z} &
@@ -1365,12 +1365,12 @@
13651365
\indextext{literal!character}%
13661366
\begin{bnf}
13671367
\nontermdef{character-literal}\br
1368-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1368+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
13691369
\end{bnf}
13701370

13711371
\begin{bnf}
13721372
\nontermdef{encoding-prefix} \textnormal{one of}\br
1373-
\terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L}
1373+
\literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L}
13741374
\end{bnf}
13751375

13761376
\begin{bnf}
@@ -1423,16 +1423,16 @@
14231423

14241424
\begin{bnf}
14251425
\nontermdef{octal-escape-sequence}\br
1426-
\terminal{\textbackslash} octal-digit\br
1427-
\terminal{\textbackslash} octal-digit octal-digit\br
1428-
\terminal{\textbackslash} octal-digit octal-digit octal-digit\br
1429-
\terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}}\br
1426+
\literalterminal{\textbackslash} octal-digit\br
1427+
\literalterminal{\textbackslash} octal-digit octal-digit\br
1428+
\literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br
1429+
\literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}}\br
14301430
\end{bnf}
14311431

14321432
\begin{bnf}
14331433
\nontermdef{hexadecimal-escape-sequence}\br
1434-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1435-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1434+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1435+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14361436
\end{bnf}
14371437

14381438
\begin{bnf}
@@ -1620,42 +1620,42 @@
16201620

16211621
\begin{bnf}
16221622
\nontermdef{fractional-constant}\br
1623-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1624-
digit-sequence \terminal{.}
1623+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1624+
digit-sequence \literalterminal{.}
16251625
\end{bnf}
16261626

16271627
\begin{bnf}
16281628
\nontermdef{hexadecimal-fractional-constant}\br
1629-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1630-
hexadecimal-digit-sequence \terminal{.}
1629+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1630+
hexadecimal-digit-sequence \literalterminal{.}
16311631
\end{bnf}
16321632

16331633
\begin{bnf}
16341634
\nontermdef{exponent-part}\br
1635-
\terminal{e} \opt{sign} digit-sequence\br
1636-
\terminal{E} \opt{sign} digit-sequence
1635+
\literalterminal{e} \opt{sign} digit-sequence\br
1636+
\literalterminal{E} \opt{sign} digit-sequence
16371637
\end{bnf}
16381638

16391639
\begin{bnf}
16401640
\nontermdef{binary-exponent-part}\br
1641-
\terminal{p} \opt{sign} digit-sequence\br
1642-
\terminal{P} \opt{sign} digit-sequence
1641+
\literalterminal{p} \opt{sign} digit-sequence\br
1642+
\literalterminal{P} \opt{sign} digit-sequence
16431643
\end{bnf}
16441644

16451645
\begin{bnf}
16461646
\nontermdef{sign} \textnormal{one of}\br
1647-
\terminal{+ -}
1647+
\literalterminal{+ -}
16481648
\end{bnf}
16491649

16501650
\begin{bnf}
16511651
\nontermdef{digit-sequence}\br
16521652
digit\br
1653-
digit-sequence \opt{\terminal{'}} digit
1653+
digit-sequence \opt{\literalterminal{'}} digit
16541654
\end{bnf}
16551655

16561656
\begin{bnf}
16571657
\nontermdef{floating-point-suffix} \textnormal{one of}\br
1658-
\terminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
1658+
\literalterminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
16591659
\end{bnf}
16601660

16611661
\pnum
@@ -1683,13 +1683,13 @@
16831683
\topline
16841684
\lhdr{\grammarterm{floating-point-suffix}} & \rhdr{type} \\ \capsep
16851685
none & \keyword{double} \\
1686-
\tcode{f} or \tcode{F} & \keyword {float} \\
1687-
\tcode{l} or \tcode{L} & \keyword{long} \keyword{double} \\
1688-
\tcode{f16} or \tcode{F16} & \tcode{std::float16_t} \\
1689-
\tcode{f32} or \tcode{F32} & \tcode{std::float32_t} \\
1690-
\tcode{f64} or \tcode{F64} & \tcode{std::float64_t} \\
1691-
\tcode{f128} or \tcode{F128} & \tcode{std::float128_t} \\
1692-
\tcode{bf16} or \tcode{BF16} & \tcode{std::bfloat16_t} \\
1686+
\literaltcode{f} or \literaltcode{F} & \keyword {float} \\
1687+
\literaltcode{l} or \literaltcode{L} & \keyword{long} \keyword{double} \\
1688+
\literaltcode{f16} or \literaltcode{F16} & \literaltcode{std::float16_t} \\
1689+
\literaltcode{f32} or \literaltcode{F32} & \literaltcode{std::float32_t} \\
1690+
\literaltcode{f64} or \literaltcode{F64} & \literaltcode{std::float64_t} \\
1691+
\literaltcode{f128} or \literaltcode{F128} & \literaltcode{std::float128_t} \\
1692+
\literaltcode{bf16} or \literaltcode{BF16} & \literaltcode{std::bfloat16_t} \\
16931693
\end{simpletypetable}
16941694

16951695
\pnum
@@ -1740,8 +1740,8 @@
17401740
\indextext{literal!string}%
17411741
\begin{bnf}
17421742
\nontermdef{string-literal}\br
1743-
\opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br
1744-
\opt{encoding-prefix} \terminal{R} raw-string
1743+
\opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br
1744+
\opt{encoding-prefix} \literalterminal{R} raw-string
17451745
\end{bnf}
17461746

17471747
\begin{bnf}
@@ -1765,7 +1765,7 @@
17651765

17661766
\begin{bnf}
17671767
\nontermdef{raw-string}\br
1768-
\terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"}
1768+
\literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"}
17691769
\end{bnf}
17701770

17711771
\begin{bnf}
@@ -1852,7 +1852,7 @@
18521852

18531853
\pnum
18541854
\indextext{literal!string!raw}%
1855-
A \grammarterm{string-literal} that has an \tcode{R}
1855+
A \grammarterm{string-literal} that has an \literaltcode{R}
18561856
\indextext{prefix!\idxcode{R}}%
18571857
in the prefix is a \defn{raw string literal}. The
18581858
\grammarterm{d-char-sequence} serves as a delimiter. The terminating

0 commit comments

Comments
 (0)