Skip to content

Commit 6e89526

Browse files
EelisEelis
committed
Use cxxdraft-htmlgen macros to annotate non-C++ code and literal fragments.
1 parent 9fb50a7 commit 6e89526

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
@@ -334,43 +334,43 @@
334334
\ucode{000c} & \uname{form feed} & \\
335335
\ucode{0020} & \uname{space} & \\
336336
\ucode{000a} & \uname{line feed} & new-line \\
337-
\ucode{0021} & \uname{exclamation mark} & \tcode{!} \\
338-
\ucode{0022} & \uname{quotation mark} & \tcode{"} \\
339-
\ucode{0023} & \uname{number sign} & \tcode{\#} \\
340-
\ucode{0024} & \uname{dollar sign} & \tcode{\$} \\
341-
\ucode{0025} & \uname{percent sign} & \tcode{\%} \\
342-
\ucode{0026} & \uname{ampersand} & \tcode{\&} \\
343-
\ucode{0027} & \uname{apostrophe} & \tcode{'} \\
344-
\ucode{0028} & \uname{left parenthesis} & \tcode{(} \\
345-
\ucode{0029} & \uname{right parenthesis} & \tcode{)} \\
346-
\ucode{002a} & \uname{asterisk} & \tcode{*} \\
347-
\ucode{002b} & \uname{plus sign} & \tcode{+} \\
348-
\ucode{002c} & \uname{comma} & \tcode{,} \\
349-
\ucode{002d} & \uname{hyphen-minus} & \tcode{-} \\
350-
\ucode{002e} & \uname{full stop} & \tcode{.} \\
351-
\ucode{002f} & \uname{solidus} & \tcode{/} \\
352-
\ucode{0030} .. \ucode{0039} & \uname{digit zero .. nine} & \tcode{0 1 2 3 4 5 6 7 8 9} \\
353-
\ucode{003a} & \uname{colon} & \tcode{:} \\
354-
\ucode{003b} & \uname{semicolon} & \tcode{;} \\
355-
\ucode{003c} & \uname{less-than sign} & \tcode{<} \\
356-
\ucode{003d} & \uname{equals sign} & \tcode{=} \\
357-
\ucode{003e} & \uname{greater-than sign} & \tcode{>} \\
358-
\ucode{003f} & \uname{question mark} & \tcode{?} \\
359-
\ucode{0040} & \uname{commercial at} & \tcode{@} \\
360-
\ucode{0041} .. \ucode{005a} & \uname{latin capital letter a .. z} & \tcode{A B C D E F G H I J K L M} \\
361-
& & \tcode{N O P Q R S T U V W X Y Z} \\
362-
\ucode{005b} & \uname{left square bracket} & \tcode{[} \\
363-
\ucode{005c} & \uname{reverse solidus} & \tcode{\textbackslash} \\
364-
\ucode{005d} & \uname{right square bracket} & \tcode{]} \\
365-
\ucode{005e} & \uname{circumflex accent} & \tcode{\caret} \\
366-
\ucode{005f} & \uname{low line} & \tcode{_} \\
367-
\ucode{0060} & \uname{grave accent} & \tcode{\`} \\
368-
\ucode{0061} .. \ucode{007a} & \uname{latin small letter a .. z} & \tcode{a b c d e f g h i j k l m} \\
369-
& & \tcode{n o p q r s t u v w x y z} \\
370-
\ucode{007b} & \uname{left curly bracket} & \tcode{\{} \\
371-
\ucode{007c} & \uname{vertical line} & \tcode{|} \\
372-
\ucode{007d} & \uname{right curly bracket} & \tcode{\}} \\
373-
\ucode{007e} & \uname{tilde} & \tcode{\textasciitilde} \\
337+
\ucode{0021} & \uname{exclamation mark} & \noncxxtcode{!} \\
338+
\ucode{0022} & \uname{quotation mark} & \noncxxtcode{"} \\
339+
\ucode{0023} & \uname{number sign} & \noncxxtcode{\#} \\
340+
\ucode{0024} & \uname{dollar sign} & \noncxxtcode{\$} \\
341+
\ucode{0025} & \uname{percent sign} & \noncxxtcode{\%} \\
342+
\ucode{0026} & \uname{ampersand} & \noncxxtcode{\&} \\
343+
\ucode{0027} & \uname{apostrophe} & \noncxxtcode{'} \\
344+
\ucode{0028} & \uname{left parenthesis} & \noncxxtcode{(} \\
345+
\ucode{0029} & \uname{right parenthesis} & \noncxxtcode{)} \\
346+
\ucode{002a} & \uname{asterisk} & \noncxxtcode{*} \\
347+
\ucode{002b} & \uname{plus sign} & \noncxxtcode{+} \\
348+
\ucode{002c} & \uname{comma} & \noncxxtcode{,} \\
349+
\ucode{002d} & \uname{hyphen-minus} & \noncxxtcode{-} \\
350+
\ucode{002e} & \uname{full stop} & \noncxxtcode{.} \\
351+
\ucode{002f} & \uname{solidus} & \noncxxtcode{/} \\
352+
\ucode{0030} .. \ucode{0039} & \uname{digit zero .. nine} & \noncxxtcode{0 1 2 3 4 5 6 7 8 9} \\
353+
\ucode{003a} & \uname{colon} & \noncxxtcode{:} \\
354+
\ucode{003b} & \uname{semicolon} & \noncxxtcode{;} \\
355+
\ucode{003c} & \uname{less-than sign} & \noncxxtcode{<} \\
356+
\ucode{003d} & \uname{equals sign} & \noncxxtcode{=} \\
357+
\ucode{003e} & \uname{greater-than sign} & \noncxxtcode{>} \\
358+
\ucode{003f} & \uname{question mark} & \noncxxtcode{?} \\
359+
\ucode{0040} & \uname{commercial at} & \noncxxtcode{@} \\
360+
\ucode{0041} .. \ucode{005a} & \uname{latin capital letter a .. z} & \noncxxtcode{A B C D E F G H I J K L M} \\
361+
& & \noncxxtcode{N O P Q R S T U V W X Y Z} \\
362+
\ucode{005b} & \uname{left square bracket} & \noncxxtcode{[} \\
363+
\ucode{005c} & \uname{reverse solidus} & \noncxxtcode{\textbackslash} \\
364+
\ucode{005d} & \uname{right square bracket} & \noncxxtcode{]} \\
365+
\ucode{005e} & \uname{circumflex accent} & \noncxxtcode{\caret} \\
366+
\ucode{005f} & \uname{low line} & \noncxxtcode{_} \\
367+
\ucode{0060} & \uname{grave accent} & \noncxxtcode{\`} \\
368+
\ucode{0061} .. \ucode{007a} & \uname{latin small letter a .. z} & \noncxxtcode{a b c d e f g h i j k l m} \\
369+
& & \noncxxtcode{n o p q r s t u v w x y z} \\
370+
\ucode{007b} & \uname{left curly bracket} & \noncxxtcode{\{} \\
371+
\ucode{007c} & \uname{vertical line} & \noncxxtcode{|} \\
372+
\ucode{007d} & \uname{right curly bracket} & \noncxxtcode{\}} \\
373+
\ucode{007e} & \uname{tilde} & \noncxxtcode{\textasciitilde} \\
374374
\end{floattable}
375375

376376
\pnum
@@ -607,15 +607,15 @@
607607
\item
608608
\indextext{literal!string!raw}%
609609
If the next character begins a sequence of characters that could be the prefix
610-
and initial double quote of a raw string literal, such as \tcode{R"}, the next preprocessing
610+
and initial double quote of a raw string literal, such as \literaltcode{R"}, the next preprocessing
611611
token shall be a raw string literal. Between the initial and final
612612
double quote characters of the raw string, any transformations performed in phase
613613
2 (line splicing) are reverted; this reversion
614614
shall apply before any \grammarterm{d-char}, \grammarterm{r-char}, or delimiting
615615
parenthesis is identified. The raw string literal is defined as the shortest sequence
616616
of characters that matches the raw-string pattern
617617
\begin{ncbnf}
618-
\opt{encoding-prefix} \terminal{R} raw-string
618+
\opt{encoding-prefix} \literalterminal{R} raw-string
619619
\end{ncbnf}
620620

621621
\item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
@@ -750,15 +750,15 @@
750750
\begin{bnf}
751751
\nontermdef{pp-number}\br
752752
digit\br
753-
\terminal{.} digit\br
753+
\literalterminal{.} digit\br
754754
pp-number identifier-continue\br
755-
pp-number \terminal{'} digit\br
756-
pp-number \terminal{'} nondigit\br
757-
pp-number \terminal{e} sign\br
758-
pp-number \terminal{E} sign\br
759-
pp-number \terminal{p} sign\br
760-
pp-number \terminal{P} sign\br
761-
pp-number \terminal{.}
755+
pp-number \literalterminal{'} digit\br
756+
pp-number \literalterminal{'} nondigit\br
757+
pp-number \literalterminal{e} sign\br
758+
pp-number \literalterminal{E} sign\br
759+
pp-number \literalterminal{p} sign\br
760+
pp-number \literalterminal{P} sign\br
761+
pp-number \literalterminal{.}
762762
\end{bnf}
763763

764764
\pnum
@@ -1185,19 +1185,19 @@
11851185
\nontermdef{binary-literal}\br
11861186
\terminal{0b} binary-digit\br
11871187
\terminal{0B} binary-digit\br
1188-
binary-literal \opt{\terminal{'}} binary-digit
1188+
binary-literal \opt{\literalterminal{'}} binary-digit
11891189
\end{bnf}
11901190

11911191
\begin{bnf}
11921192
\nontermdef{octal-literal}\br
11931193
\terminal{0}\br
1194-
octal-literal \opt{\terminal{'}} octal-digit
1194+
octal-literal \opt{\literalterminal{'}} octal-digit
11951195
\end{bnf}
11961196

11971197
\begin{bnf}
11981198
\nontermdef{decimal-literal}\br
11991199
nonzero-digit\br
1200-
decimal-literal \opt{\terminal{'}} digit
1200+
decimal-literal \opt{\literalterminal{'}} digit
12011201
\end{bnf}
12021202

12031203
\begin{bnf}
@@ -1228,14 +1228,14 @@
12281228
\begin{bnf}
12291229
\nontermdef{hexadecimal-digit-sequence}\br
12301230
hexadecimal-digit\br
1231-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1231+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
12321232
\end{bnf}
12331233

12341234
\begin{bnf}
12351235
\nontermdef{hexadecimal-digit} \textnormal{one of}\br
1236-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
1237-
\terminal{a b c d e f}\br
1238-
\terminal{A B C D E F}
1236+
\literalterminal{0 1 2 3 4 5 6 7 8 9}\br
1237+
\literalterminal{a b c d e f}\br
1238+
\literalterminal{A B C D E F}
12391239
\end{bnf}
12401240

12411241
\begin{bnf}
@@ -1250,17 +1250,17 @@
12501250

12511251
\begin{bnf}
12521252
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1253-
\terminal{u U}
1253+
\literalterminal{u U}
12541254
\end{bnf}
12551255

12561256
\begin{bnf}
12571257
\nontermdef{long-suffix} \textnormal{one of}\br
1258-
\terminal{l L}
1258+
\literalterminal{l L}
12591259
\end{bnf}
12601260

12611261
\begin{bnf}
12621262
\nontermdef{long-long-suffix} \textnormal{one of}\br
1263-
\terminal{ll LL}
1263+
\literalterminal{ll LL}
12641264
\end{bnf}
12651265

12661266
\begin{bnf}
@@ -1299,7 +1299,7 @@
12991299

13001300
\pnum
13011301
The \grammarterm{hexadecimal-digit}s
1302-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1302+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
13031303
have decimal values ten through fifteen.
13041304
\begin{example}
13051305
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1343,7 +1343,7 @@
13431343
&
13441344
&
13451345
\tcode{unsigned long long int}\\\hline
1346-
\tcode{u} or \tcode{U} &
1346+
\literaltcode{u} or \literaltcode{U} &
13471347
\tcode{unsigned int} &
13481348
\tcode{unsigned int}\\
13491349
&
@@ -1352,7 +1352,7 @@
13521352
&
13531353
\tcode{unsigned long long int} &
13541354
\tcode{unsigned long long int}\\\hline
1355-
\tcode{l} or \tcode{L} &
1355+
\literaltcode{l} or \literaltcode{L} &
13561356
\tcode{long int} &
13571357
\tcode{long int}\\
13581358
&
@@ -1364,22 +1364,22 @@
13641364
&
13651365
&
13661366
\tcode{unsigned long long int}\\\hline
1367-
Both \tcode{u} or \tcode{U} &
1367+
Both \literaltcode{u} or \literaltcode{U} &
13681368
\tcode{unsigned long int} &
13691369
\tcode{unsigned long int}\\
1370-
and \tcode{l} or \tcode{L} &
1370+
and \literaltcode{l} or \literaltcode{L} &
13711371
\tcode{unsigned long long int} &
13721372
\tcode{unsigned long long int}\\\hline
1373-
\tcode{ll} or \tcode{LL} &
1373+
\literaltcode{ll} or \literaltcode{LL} &
13741374
\tcode{long long int} &
13751375
\tcode{long long int}\\
13761376
&
13771377
&
13781378
\tcode{unsigned long long int}\\\hline
1379-
Both \tcode{u} or \tcode{U} &
1379+
Both \literaltcode{u} or \literaltcode{U} &
13801380
\tcode{unsigned long long int} &
13811381
\tcode{unsigned long long int}\\
1382-
and \tcode{ll} or \tcode{LL} &
1382+
and \literaltcode{ll} or \literaltcode{LL} &
13831383
&
13841384
\\\hline
13851385
\tcode{z} or \tcode{Z} &
@@ -1427,12 +1427,12 @@
14271427
\indextext{literal!character}%
14281428
\begin{bnf}
14291429
\nontermdef{character-literal}\br
1430-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1430+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
14311431
\end{bnf}
14321432

14331433
\begin{bnf}
14341434
\nontermdef{encoding-prefix} \textnormal{one of}\br
1435-
\terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L}
1435+
\literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L}
14361436
\end{bnf}
14371437

14381438
\begin{bnf}
@@ -1483,16 +1483,16 @@
14831483

14841484
\begin{bnf}
14851485
\nontermdef{octal-escape-sequence}\br
1486-
\terminal{\textbackslash} octal-digit\br
1487-
\terminal{\textbackslash} octal-digit octal-digit\br
1488-
\terminal{\textbackslash} octal-digit octal-digit octal-digit\br
1489-
\terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}}
1486+
\literalterminal{\textbackslash} octal-digit\br
1487+
\literalterminal{\textbackslash} octal-digit octal-digit\br
1488+
\literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br
1489+
\literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}}
14901490
\end{bnf}
14911491

14921492
\begin{bnf}
14931493
\nontermdef{hexadecimal-escape-sequence}\br
1494-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1495-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1494+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1495+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14961496
\end{bnf}
14971497

14981498
\begin{bnf}
@@ -1680,42 +1680,42 @@
16801680

16811681
\begin{bnf}
16821682
\nontermdef{fractional-constant}\br
1683-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1684-
digit-sequence \terminal{.}
1683+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1684+
digit-sequence \literalterminal{.}
16851685
\end{bnf}
16861686

16871687
\begin{bnf}
16881688
\nontermdef{hexadecimal-fractional-constant}\br
1689-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1690-
hexadecimal-digit-sequence \terminal{.}
1689+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1690+
hexadecimal-digit-sequence \literalterminal{.}
16911691
\end{bnf}
16921692

16931693
\begin{bnf}
16941694
\nontermdef{exponent-part}\br
1695-
\terminal{e} \opt{sign} digit-sequence\br
1696-
\terminal{E} \opt{sign} digit-sequence
1695+
\literalterminal{e} \opt{sign} digit-sequence\br
1696+
\literalterminal{E} \opt{sign} digit-sequence
16971697
\end{bnf}
16981698

16991699
\begin{bnf}
17001700
\nontermdef{binary-exponent-part}\br
1701-
\terminal{p} \opt{sign} digit-sequence\br
1702-
\terminal{P} \opt{sign} digit-sequence
1701+
\literalterminal{p} \opt{sign} digit-sequence\br
1702+
\literalterminal{P} \opt{sign} digit-sequence
17031703
\end{bnf}
17041704

17051705
\begin{bnf}
17061706
\nontermdef{sign} \textnormal{one of}\br
1707-
\terminal{+ -}
1707+
\literalterminal{+ -}
17081708
\end{bnf}
17091709

17101710
\begin{bnf}
17111711
\nontermdef{digit-sequence}\br
17121712
digit\br
1713-
digit-sequence \opt{\terminal{'}} digit
1713+
digit-sequence \opt{\literalterminal{'}} digit
17141714
\end{bnf}
17151715

17161716
\begin{bnf}
17171717
\nontermdef{floating-point-suffix} \textnormal{one of}\br
1718-
\terminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
1718+
\literalterminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16}
17191719
\end{bnf}
17201720

17211721
\pnum
@@ -1800,8 +1800,8 @@
18001800
\indextext{literal!string}%
18011801
\begin{bnf}
18021802
\nontermdef{string-literal}\br
1803-
\opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br
1804-
\opt{encoding-prefix} \terminal{R} raw-string
1803+
\opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br
1804+
\opt{encoding-prefix} \literalterminal{R} raw-string
18051805
\end{bnf}
18061806

18071807
\begin{bnf}
@@ -1824,7 +1824,7 @@
18241824

18251825
\begin{bnf}
18261826
\nontermdef{raw-string}\br
1827-
\terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"}
1827+
\literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"}
18281828
\end{bnf}
18291829

18301830
\begin{bnf}
@@ -1911,7 +1911,7 @@
19111911

19121912
\pnum
19131913
\indextext{literal!string!raw}%
1914-
A \grammarterm{string-literal} that has an \tcode{R}
1914+
A \grammarterm{string-literal} that has an \literaltcode{R}
19151915
\indextext{prefix!\idxcode{R}}%
19161916
in the prefix is a \defn{raw string literal}. The
19171917
\grammarterm{d-char-sequence} serves as a delimiter. The terminating

0 commit comments

Comments
 (0)