Skip to content

Commit 83df9e7

Browse files
EelisEelis
committed
Use cxxdraft-htmlgen macros to annotate non-C++ code and literal fragments.
1 parent 9864fd4 commit 83df9e7

File tree

3 files changed

+349
-349
lines changed

3 files changed

+349
-349
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: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -293,43 +293,43 @@
293293
\ucode{000c} & \uname{form feed} & \\
294294
\ucode{0020} & \uname{space} & \\
295295
\ucode{000a} & \uname{line feed} & new-line \\
296-
\ucode{0021} & \uname{exclamation mark} & \tcode{!} \\
297-
\ucode{0022} & \uname{quotation mark} & \tcode{"} \\
298-
\ucode{0023} & \uname{number sign} & \tcode{\#} \\
299-
\ucode{0024} & \uname{dollar sign} & \tcode{\$} \\
300-
\ucode{0025} & \uname{percent sign} & \tcode{\%} \\
301-
\ucode{0026} & \uname{ampersand} & \tcode{\&} \\
302-
\ucode{0027} & \uname{apostrophe} & \tcode{'} \\
303-
\ucode{0028} & \uname{left parenthesis} & \tcode{(} \\
304-
\ucode{0029} & \uname{right parenthesis} & \tcode{)} \\
305-
\ucode{002a} & \uname{asterisk} & \tcode{*} \\
306-
\ucode{002b} & \uname{plus sign} & \tcode{+} \\
307-
\ucode{002c} & \uname{comma} & \tcode{,} \\
308-
\ucode{002d} & \uname{hyphen-minus} & \tcode{-} \\
309-
\ucode{002e} & \uname{full stop} & \tcode{.} \\
310-
\ucode{002f} & \uname{solidus} & \tcode{/} \\
311-
\ucode{0030} .. \ucode{0039} & \uname{digit zero .. nine} & \tcode{0 1 2 3 4 5 6 7 8 9} \\
312-
\ucode{003a} & \uname{colon} & \tcode{:} \\
313-
\ucode{003b} & \uname{semicolon} & \tcode{;} \\
314-
\ucode{003c} & \uname{less-than sign} & \tcode{<} \\
315-
\ucode{003d} & \uname{equals sign} & \tcode{=} \\
316-
\ucode{003e} & \uname{greater-than sign} & \tcode{>} \\
317-
\ucode{003f} & \uname{question mark} & \tcode{?} \\
318-
\ucode{0040} & \uname{commercial at} & \tcode{@} \\
319-
\ucode{0041} .. \ucode{005a} & \uname{latin capital letter a .. z} & \tcode{A B C D E F G H I J K L M} \\
320-
& & \tcode{N O P Q R S T U V W X Y Z} \\
321-
\ucode{005b} & \uname{left square bracket} & \tcode{[} \\
322-
\ucode{005c} & \uname{reverse solidus} & \tcode{\textbackslash} \\
323-
\ucode{005d} & \uname{right square bracket} & \tcode{]} \\
324-
\ucode{005e} & \uname{circumflex accent} & \tcode{\caret} \\
325-
\ucode{005f} & \uname{low line} & \tcode{_} \\
326-
\ucode{0060} & \uname{grave accent} & \tcode{\`} \\
327-
\ucode{0061} .. \ucode{007a} & \uname{latin small letter a .. z} & \tcode{a b c d e f g h i j k l m} \\
328-
& & \tcode{n o p q r s t u v w x y z} \\
329-
\ucode{007b} & \uname{left curly bracket} & \tcode{\{} \\
330-
\ucode{007c} & \uname{vertical line} & \tcode{|} \\
331-
\ucode{007d} & \uname{right curly bracket} & \tcode{\}} \\
332-
\ucode{007e} & \uname{tilde} & \tcode{\textasciitilde} \\
296+
\ucode{0021} & \uname{exclamation mark} & \noncxxtcode{!} \\
297+
\ucode{0022} & \uname{quotation mark} & \noncxxtcode{"} \\
298+
\ucode{0023} & \uname{number sign} & \noncxxtcode{\#} \\
299+
\ucode{0024} & \uname{dollar sign} & \noncxxtcode{\$} \\
300+
\ucode{0025} & \uname{percent sign} & \noncxxtcode{\%} \\
301+
\ucode{0026} & \uname{ampersand} & \noncxxtcode{\&} \\
302+
\ucode{0027} & \uname{apostrophe} & \noncxxtcode{'} \\
303+
\ucode{0028} & \uname{left parenthesis} & \noncxxtcode{(} \\
304+
\ucode{0029} & \uname{right parenthesis} & \noncxxtcode{)} \\
305+
\ucode{002a} & \uname{asterisk} & \noncxxtcode{*} \\
306+
\ucode{002b} & \uname{plus sign} & \noncxxtcode{+} \\
307+
\ucode{002c} & \uname{comma} & \noncxxtcode{,} \\
308+
\ucode{002d} & \uname{hyphen-minus} & \noncxxtcode{-} \\
309+
\ucode{002e} & \uname{full stop} & \noncxxtcode{.} \\
310+
\ucode{002f} & \uname{solidus} & \noncxxtcode{/} \\
311+
\ucode{0030} .. \ucode{0039} & \uname{digit zero .. nine} & \noncxxtcode{0 1 2 3 4 5 6 7 8 9} \\
312+
\ucode{003a} & \uname{colon} & \noncxxtcode{:} \\
313+
\ucode{003b} & \uname{semicolon} & \noncxxtcode{;} \\
314+
\ucode{003c} & \uname{less-than sign} & \noncxxtcode{<} \\
315+
\ucode{003d} & \uname{equals sign} & \noncxxtcode{=} \\
316+
\ucode{003e} & \uname{greater-than sign} & \noncxxtcode{>} \\
317+
\ucode{003f} & \uname{question mark} & \noncxxtcode{?} \\
318+
\ucode{0040} & \uname{commercial at} & \noncxxtcode{@} \\
319+
\ucode{0041} .. \ucode{005a} & \uname{latin capital letter a .. z} & \noncxxtcode{A B C D E F G H I J K L M} \\
320+
& & \noncxxtcode{N O P Q R S T U V W X Y Z} \\
321+
\ucode{005b} & \uname{left square bracket} & \noncxxtcode{[} \\
322+
\ucode{005c} & \uname{reverse solidus} & \noncxxtcode{\textbackslash} \\
323+
\ucode{005d} & \uname{right square bracket} & \noncxxtcode{]} \\
324+
\ucode{005e} & \uname{circumflex accent} & \noncxxtcode{\caret} \\
325+
\ucode{005f} & \uname{low line} & \noncxxtcode{_} \\
326+
\ucode{0060} & \uname{grave accent} & \noncxxtcode{\`} \\
327+
\ucode{0061} .. \ucode{007a} & \uname{latin small letter a .. z} & \noncxxtcode{a b c d e f g h i j k l m} \\
328+
& & \noncxxtcode{n o p q r s t u v w x y z} \\
329+
\ucode{007b} & \uname{left curly bracket} & \noncxxtcode{\{} \\
330+
\ucode{007c} & \uname{vertical line} & \noncxxtcode{|} \\
331+
\ucode{007d} & \uname{right curly bracket} & \noncxxtcode{\}} \\
332+
\ucode{007e} & \uname{tilde} & \noncxxtcode{\textasciitilde} \\
333333
\end{floattable}
334334

335335
\pnum
@@ -569,15 +569,15 @@
569569
\item
570570
\indextext{literal!string!raw}%
571571
If the next character begins a sequence of characters that could be the prefix
572-
and initial double quote of a raw string literal, such as \tcode{R"}, the next preprocessing
572+
and initial double quote of a raw string literal, such as \literaltcode{R"}, the next preprocessing
573573
token shall be a raw string literal. Between the initial and final
574574
double quote characters of the raw string, any transformations performed in phase
575575
2 (line splicing) are reverted; this reversion
576576
shall apply before any \grammarterm{d-char}, \grammarterm{r-char}, or delimiting
577577
parenthesis is identified. The raw string literal is defined as the shortest sequence
578578
of characters that matches the raw-string pattern
579579
\begin{ncbnf}
580-
\opt{encoding-prefix} \terminal{R} raw-string
580+
\opt{encoding-prefix} \literalterminal{R} raw-string
581581
\end{ncbnf}
582582

583583
\item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
@@ -702,15 +702,15 @@
702702
\begin{bnf}
703703
\nontermdef{pp-number}\br
704704
digit\br
705-
\terminal{.} digit\br
705+
\literalterminal{.} digit\br
706706
pp-number identifier-continue\br
707-
pp-number \terminal{'} digit\br
708-
pp-number \terminal{'} nondigit\br
709-
pp-number \terminal{e} sign\br
710-
pp-number \terminal{E} sign\br
711-
pp-number \terminal{p} sign\br
712-
pp-number \terminal{P} sign\br
713-
pp-number \terminal{.}
707+
pp-number \literalterminal{'} digit\br
708+
pp-number \literalterminal{'} nondigit\br
709+
pp-number \literalterminal{e} sign\br
710+
pp-number \literalterminal{E} sign\br
711+
pp-number \literalterminal{p} sign\br
712+
pp-number \literalterminal{P} sign\br
713+
pp-number \literalterminal{.}
714714
\end{bnf}
715715

716716
\pnum
@@ -1137,19 +1137,19 @@
11371137
\nontermdef{binary-literal}\br
11381138
\terminal{0b} binary-digit\br
11391139
\terminal{0B} binary-digit\br
1140-
binary-literal \opt{\terminal{'}} binary-digit
1140+
binary-literal \opt{\literalterminal{'}} binary-digit
11411141
\end{bnf}
11421142

11431143
\begin{bnf}
11441144
\nontermdef{octal-literal}\br
11451145
\terminal{0}\br
1146-
octal-literal \opt{\terminal{'}} octal-digit
1146+
octal-literal \opt{\literalterminal{'}} octal-digit
11471147
\end{bnf}
11481148

11491149
\begin{bnf}
11501150
\nontermdef{decimal-literal}\br
11511151
nonzero-digit\br
1152-
decimal-literal \opt{\terminal{'}} digit
1152+
decimal-literal \opt{\literalterminal{'}} digit
11531153
\end{bnf}
11541154

11551155
\begin{bnf}
@@ -1180,14 +1180,14 @@
11801180
\begin{bnf}
11811181
\nontermdef{hexadecimal-digit-sequence}\br
11821182
hexadecimal-digit\br
1183-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1183+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
11841184
\end{bnf}
11851185

11861186
\begin{bnf}
11871187
\nontermdef{hexadecimal-digit} \textnormal{one of}\br
1188-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
1189-
\terminal{a b c d e f}\br
1190-
\terminal{A B C D E F}
1188+
\literalterminal{0 1 2 3 4 5 6 7 8 9}\br
1189+
\literalterminal{a b c d e f}\br
1190+
\literalterminal{A B C D E F}
11911191
\end{bnf}
11921192

11931193
\begin{bnf}
@@ -1202,17 +1202,17 @@
12021202

12031203
\begin{bnf}
12041204
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1205-
\terminal{u U}
1205+
\literalterminal{u U}
12061206
\end{bnf}
12071207

12081208
\begin{bnf}
12091209
\nontermdef{long-suffix} \textnormal{one of}\br
1210-
\terminal{l L}
1210+
\literalterminal{l L}
12111211
\end{bnf}
12121212

12131213
\begin{bnf}
12141214
\nontermdef{long-long-suffix} \textnormal{one of}\br
1215-
\terminal{ll LL}
1215+
\literalterminal{ll LL}
12161216
\end{bnf}
12171217

12181218
\begin{bnf}
@@ -1251,7 +1251,7 @@
12511251

12521252
\pnum
12531253
The \grammarterm{hexadecimal-digit}s
1254-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1254+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
12551255
have decimal values ten through fifteen.
12561256
\begin{example}
12571257
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1295,7 +1295,7 @@
12951295
&
12961296
&
12971297
\tcode{unsigned long long int}\\\hline
1298-
\tcode{u} or \tcode{U} &
1298+
\literaltcode{u} or \literaltcode{U} &
12991299
\tcode{unsigned int} &
13001300
\tcode{unsigned int}\\
13011301
&
@@ -1304,7 +1304,7 @@
13041304
&
13051305
\tcode{unsigned long long int} &
13061306
\tcode{unsigned long long int}\\\hline
1307-
\tcode{l} or \tcode{L} &
1307+
\literaltcode{l} or \literaltcode{L} &
13081308
\tcode{long int} &
13091309
\tcode{long int}\\
13101310
&
@@ -1316,22 +1316,22 @@
13161316
&
13171317
&
13181318
\tcode{unsigned long long int}\\\hline
1319-
Both \tcode{u} or \tcode{U} &
1319+
Both \literaltcode{u} or \literaltcode{U} &
13201320
\tcode{unsigned long int} &
13211321
\tcode{unsigned long int}\\
1322-
and \tcode{l} or \tcode{L} &
1322+
and \literaltcode{l} or \literaltcode{L} &
13231323
\tcode{unsigned long long int} &
13241324
\tcode{unsigned long long int}\\\hline
1325-
\tcode{ll} or \tcode{LL} &
1325+
\literaltcode{ll} or \literaltcode{LL} &
13261326
\tcode{long long int} &
13271327
\tcode{long long int}\\
13281328
&
13291329
&
13301330
\tcode{unsigned long long int}\\\hline
1331-
Both \tcode{u} or \tcode{U} &
1331+
Both \literaltcode{u} or \literaltcode{U} &
13321332
\tcode{unsigned long long int} &
13331333
\tcode{unsigned long long int}\\
1334-
and \tcode{ll} or \tcode{LL} &
1334+
and \literaltcode{ll} or \literaltcode{LL} &
13351335
&
13361336
\\\hline
13371337
\tcode{z} or \tcode{Z} &
@@ -1379,12 +1379,12 @@
13791379
\indextext{literal!character}%
13801380
\begin{bnf}
13811381
\nontermdef{character-literal}\br
1382-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1382+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
13831383
\end{bnf}
13841384

13851385
\begin{bnf}
13861386
\nontermdef{encoding-prefix} \textnormal{one of}\br
1387-
\terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L}
1387+
\literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L}
13881388
\end{bnf}
13891389

13901390
\begin{bnf}
@@ -1435,16 +1435,16 @@
14351435

14361436
\begin{bnf}
14371437
\nontermdef{octal-escape-sequence}\br
1438-
\terminal{\textbackslash} octal-digit\br
1439-
\terminal{\textbackslash} octal-digit octal-digit\br
1440-
\terminal{\textbackslash} octal-digit octal-digit octal-digit\br
1441-
\terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}}
1438+
\literalterminal{\textbackslash} octal-digit\br
1439+
\literalterminal{\textbackslash} octal-digit octal-digit\br
1440+
\literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br
1441+
\literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}}
14421442
\end{bnf}
14431443

14441444
\begin{bnf}
14451445
\nontermdef{hexadecimal-escape-sequence}\br
1446-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1447-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1446+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1447+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14481448
\end{bnf}
14491449

14501450
\begin{bnf}
@@ -1632,42 +1632,42 @@
16321632

16331633
\begin{bnf}
16341634
\nontermdef{fractional-constant}\br
1635-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1636-
digit-sequence \terminal{.}
1635+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1636+
digit-sequence \literalterminal{.}
16371637
\end{bnf}
16381638

16391639
\begin{bnf}
16401640
\nontermdef{hexadecimal-fractional-constant}\br
1641-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1642-
hexadecimal-digit-sequence \terminal{.}
1641+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1642+
hexadecimal-digit-sequence \literalterminal{.}
16431643
\end{bnf}
16441644

16451645
\begin{bnf}
16461646
\nontermdef{exponent-part}\br
1647-
\terminal{e} \opt{sign} digit-sequence\br
1648-
\terminal{E} \opt{sign} digit-sequence
1647+
\literalterminal{e} \opt{sign} digit-sequence\br
1648+
\literalterminal{E} \opt{sign} digit-sequence
16491649
\end{bnf}
16501650

16511651
\begin{bnf}
16521652
\nontermdef{binary-exponent-part}\br
1653-
\terminal{p} \opt{sign} digit-sequence\br
1654-
\terminal{P} \opt{sign} digit-sequence
1653+
\literalterminal{p} \opt{sign} digit-sequence\br
1654+
\literalterminal{P} \opt{sign} digit-sequence
16551655
\end{bnf}
16561656

16571657
\begin{bnf}
16581658
\nontermdef{sign} \textnormal{one of}\br
1659-
\terminal{+ -}
1659+
\literalterminal{+ -}
16601660
\end{bnf}
16611661

16621662
\begin{bnf}
16631663
\nontermdef{digit-sequence}\br
16641664
digit\br
1665-
digit-sequence \opt{\terminal{'}} digit
1665+
digit-sequence \opt{\literalterminal{'}} digit
16661666
\end{bnf}
16671667

16681668
\begin{bnf}
16691669
\nontermdef{floating-point-suffix} \textnormal{one of}\br
1670-
\terminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
1670+
\literalterminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
16711671
\end{bnf}
16721672

16731673
\pnum
@@ -1752,8 +1752,8 @@
17521752
\indextext{literal!string}%
17531753
\begin{bnf}
17541754
\nontermdef{string-literal}\br
1755-
\opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br
1756-
\opt{encoding-prefix} \terminal{R} raw-string
1755+
\opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br
1756+
\opt{encoding-prefix} \literalterminal{R} raw-string
17571757
\end{bnf}
17581758

17591759
\begin{bnf}
@@ -1776,7 +1776,7 @@
17761776

17771777
\begin{bnf}
17781778
\nontermdef{raw-string}\br
1779-
\terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"}
1779+
\literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"}
17801780
\end{bnf}
17811781

17821782
\begin{bnf}
@@ -1863,7 +1863,7 @@
18631863

18641864
\pnum
18651865
\indextext{literal!string!raw}%
1866-
A \grammarterm{string-literal} that has an \tcode{R}
1866+
A \grammarterm{string-literal} that has an \literaltcode{R}
18671867
\indextext{prefix!\idxcode{R}}%
18681868
in the prefix is a \defn{raw string literal}. The
18691869
\grammarterm{d-char-sequence} serves as a delimiter. The terminating

0 commit comments

Comments
 (0)