Skip to content

Commit a61fc97

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

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
@@ -695,15 +695,15 @@
695695
\begin{bnf}
696696
\nontermdef{pp-number}\br
697697
digit\br
698-
\terminal{.} digit\br
698+
\literalterminal{.} digit\br
699699
pp-number identifier-continue\br
700-
pp-number \terminal{'} digit\br
701-
pp-number \terminal{'} nondigit\br
702-
pp-number \terminal{e} sign\br
703-
pp-number \terminal{E} sign\br
704-
pp-number \terminal{p} sign\br
705-
pp-number \terminal{P} sign\br
706-
pp-number \terminal{.}
700+
pp-number \literalterminal{'} digit\br
701+
pp-number \literalterminal{'} nondigit\br
702+
pp-number \literalterminal{e} sign\br
703+
pp-number \literalterminal{E} sign\br
704+
pp-number \literalterminal{p} sign\br
705+
pp-number \literalterminal{P} sign\br
706+
pp-number \literalterminal{.}
707707
\end{bnf}
708708

709709
\pnum
@@ -1130,19 +1130,19 @@
11301130
\nontermdef{binary-literal}\br
11311131
\terminal{0b} binary-digit\br
11321132
\terminal{0B} binary-digit\br
1133-
binary-literal \opt{\terminal{'}} binary-digit
1133+
binary-literal \opt{\literalterminal{'}} binary-digit
11341134
\end{bnf}
11351135

11361136
\begin{bnf}
11371137
\nontermdef{octal-literal}\br
11381138
\terminal{0}\br
1139-
octal-literal \opt{\terminal{'}} octal-digit
1139+
octal-literal \opt{\literalterminal{'}} octal-digit
11401140
\end{bnf}
11411141

11421142
\begin{bnf}
11431143
\nontermdef{decimal-literal}\br
11441144
nonzero-digit\br
1145-
decimal-literal \opt{\terminal{'}} digit
1145+
decimal-literal \opt{\literalterminal{'}} digit
11461146
\end{bnf}
11471147

11481148
\begin{bnf}
@@ -1173,14 +1173,14 @@
11731173
\begin{bnf}
11741174
\nontermdef{hexadecimal-digit-sequence}\br
11751175
hexadecimal-digit\br
1176-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1176+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
11771177
\end{bnf}
11781178

11791179
\begin{bnf}
11801180
\nontermdef{hexadecimal-digit} \textnormal{one of}\br
1181-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
1182-
\terminal{a b c d e f}\br
1183-
\terminal{A B C D E F}
1181+
\literalterminal{0 1 2 3 4 5 6 7 8 9}\br
1182+
\literalterminal{a b c d e f}\br
1183+
\literalterminal{A B C D E F}
11841184
\end{bnf}
11851185

11861186
\begin{bnf}
@@ -1195,17 +1195,17 @@
11951195

11961196
\begin{bnf}
11971197
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1198-
\terminal{u U}
1198+
\literalterminal{u U}
11991199
\end{bnf}
12001200

12011201
\begin{bnf}
12021202
\nontermdef{long-suffix} \textnormal{one of}\br
1203-
\terminal{l L}
1203+
\literalterminal{l L}
12041204
\end{bnf}
12051205

12061206
\begin{bnf}
12071207
\nontermdef{long-long-suffix} \textnormal{one of}\br
1208-
\terminal{ll LL}
1208+
\literalterminal{ll LL}
12091209
\end{bnf}
12101210

12111211
\begin{bnf}
@@ -1244,7 +1244,7 @@
12441244

12451245
\pnum
12461246
The \grammarterm{hexadecimal-digit}s
1247-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1247+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
12481248
have decimal values ten through fifteen.
12491249
\begin{example}
12501250
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1288,7 +1288,7 @@
12881288
&
12891289
&
12901290
\tcode{unsigned long long int}\\\hline
1291-
\tcode{u} or \tcode{U} &
1291+
\literaltcode{u} or \literaltcode{U} &
12921292
\tcode{unsigned int} &
12931293
\tcode{unsigned int}\\
12941294
&
@@ -1297,7 +1297,7 @@
12971297
&
12981298
\tcode{unsigned long long int} &
12991299
\tcode{unsigned long long int}\\\hline
1300-
\tcode{l} or \tcode{L} &
1300+
\literaltcode{l} or \literaltcode{L} &
13011301
\tcode{long int} &
13021302
\tcode{long int}\\
13031303
&
@@ -1309,22 +1309,22 @@
13091309
&
13101310
&
13111311
\tcode{unsigned long long int}\\\hline
1312-
Both \tcode{u} or \tcode{U} &
1312+
Both \literaltcode{u} or \literaltcode{U} &
13131313
\tcode{unsigned long int} &
13141314
\tcode{unsigned long int}\\
1315-
and \tcode{l} or \tcode{L} &
1315+
and \literaltcode{l} or \literaltcode{L} &
13161316
\tcode{unsigned long long int} &
13171317
\tcode{unsigned long long int}\\\hline
1318-
\tcode{ll} or \tcode{LL} &
1318+
\literaltcode{ll} or \literaltcode{LL} &
13191319
\tcode{long long int} &
13201320
\tcode{long long int}\\
13211321
&
13221322
&
13231323
\tcode{unsigned long long int}\\\hline
1324-
Both \tcode{u} or \tcode{U} &
1324+
Both \literaltcode{u} or \literaltcode{U} &
13251325
\tcode{unsigned long long int} &
13261326
\tcode{unsigned long long int}\\
1327-
and \tcode{ll} or \tcode{LL} &
1327+
and \literaltcode{ll} or \literaltcode{LL} &
13281328
&
13291329
\\\hline
13301330
\tcode{z} or \tcode{Z} &
@@ -1372,12 +1372,12 @@
13721372
\indextext{literal!character}%
13731373
\begin{bnf}
13741374
\nontermdef{character-literal}\br
1375-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1375+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
13761376
\end{bnf}
13771377

13781378
\begin{bnf}
13791379
\nontermdef{encoding-prefix} \textnormal{one of}\br
1380-
\terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L}
1380+
\literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L}
13811381
\end{bnf}
13821382

13831383
\begin{bnf}
@@ -1428,16 +1428,16 @@
14281428

14291429
\begin{bnf}
14301430
\nontermdef{octal-escape-sequence}\br
1431-
\terminal{\textbackslash} octal-digit\br
1432-
\terminal{\textbackslash} octal-digit octal-digit\br
1433-
\terminal{\textbackslash} octal-digit octal-digit octal-digit\br
1434-
\terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}}
1431+
\literalterminal{\textbackslash} octal-digit\br
1432+
\literalterminal{\textbackslash} octal-digit octal-digit\br
1433+
\literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br
1434+
\literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}}
14351435
\end{bnf}
14361436

14371437
\begin{bnf}
14381438
\nontermdef{hexadecimal-escape-sequence}\br
1439-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1440-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1439+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1440+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14411441
\end{bnf}
14421442

14431443
\begin{bnf}
@@ -1625,42 +1625,42 @@
16251625

16261626
\begin{bnf}
16271627
\nontermdef{fractional-constant}\br
1628-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1629-
digit-sequence \terminal{.}
1628+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1629+
digit-sequence \literalterminal{.}
16301630
\end{bnf}
16311631

16321632
\begin{bnf}
16331633
\nontermdef{hexadecimal-fractional-constant}\br
1634-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1635-
hexadecimal-digit-sequence \terminal{.}
1634+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1635+
hexadecimal-digit-sequence \literalterminal{.}
16361636
\end{bnf}
16371637

16381638
\begin{bnf}
16391639
\nontermdef{exponent-part}\br
1640-
\terminal{e} \opt{sign} digit-sequence\br
1641-
\terminal{E} \opt{sign} digit-sequence
1640+
\literalterminal{e} \opt{sign} digit-sequence\br
1641+
\literalterminal{E} \opt{sign} digit-sequence
16421642
\end{bnf}
16431643

16441644
\begin{bnf}
16451645
\nontermdef{binary-exponent-part}\br
1646-
\terminal{p} \opt{sign} digit-sequence\br
1647-
\terminal{P} \opt{sign} digit-sequence
1646+
\literalterminal{p} \opt{sign} digit-sequence\br
1647+
\literalterminal{P} \opt{sign} digit-sequence
16481648
\end{bnf}
16491649

16501650
\begin{bnf}
16511651
\nontermdef{sign} \textnormal{one of}\br
1652-
\terminal{+ -}
1652+
\literalterminal{+ -}
16531653
\end{bnf}
16541654

16551655
\begin{bnf}
16561656
\nontermdef{digit-sequence}\br
16571657
digit\br
1658-
digit-sequence \opt{\terminal{'}} digit
1658+
digit-sequence \opt{\literalterminal{'}} digit
16591659
\end{bnf}
16601660

16611661
\begin{bnf}
16621662
\nontermdef{floating-point-suffix} \textnormal{one of}\br
1663-
\terminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
1663+
\literalterminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
16641664
\end{bnf}
16651665

16661666
\pnum
@@ -1745,8 +1745,8 @@
17451745
\indextext{literal!string}%
17461746
\begin{bnf}
17471747
\nontermdef{string-literal}\br
1748-
\opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br
1749-
\opt{encoding-prefix} \terminal{R} raw-string
1748+
\opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br
1749+
\opt{encoding-prefix} \literalterminal{R} raw-string
17501750
\end{bnf}
17511751

17521752
\begin{bnf}
@@ -1769,7 +1769,7 @@
17691769

17701770
\begin{bnf}
17711771
\nontermdef{raw-string}\br
1772-
\terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"}
1772+
\literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"}
17731773
\end{bnf}
17741774

17751775
\begin{bnf}
@@ -1856,7 +1856,7 @@
18561856

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

0 commit comments

Comments
 (0)