Skip to content

Commit 684643c

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

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

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

619619
\item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
@@ -748,15 +748,15 @@
748748
\begin{bnf}
749749
\nontermdef{pp-number}\br
750750
digit\br
751-
\terminal{.} digit\br
751+
\literalterminal{.} digit\br
752752
pp-number identifier-continue\br
753-
pp-number \terminal{'} digit\br
754-
pp-number \terminal{'} nondigit\br
755-
pp-number \terminal{e} sign\br
756-
pp-number \terminal{E} sign\br
757-
pp-number \terminal{p} sign\br
758-
pp-number \terminal{P} sign\br
759-
pp-number \terminal{.}
753+
pp-number \literalterminal{'} digit\br
754+
pp-number \literalterminal{'} nondigit\br
755+
pp-number \literalterminal{e} sign\br
756+
pp-number \literalterminal{E} sign\br
757+
pp-number \literalterminal{p} sign\br
758+
pp-number \literalterminal{P} sign\br
759+
pp-number \literalterminal{.}
760760
\end{bnf}
761761

762762
\pnum
@@ -1183,19 +1183,19 @@
11831183
\nontermdef{binary-literal}\br
11841184
\terminal{0b} binary-digit\br
11851185
\terminal{0B} binary-digit\br
1186-
binary-literal \opt{\terminal{'}} binary-digit
1186+
binary-literal \opt{\literalterminal{'}} binary-digit
11871187
\end{bnf}
11881188

11891189
\begin{bnf}
11901190
\nontermdef{octal-literal}\br
11911191
\terminal{0}\br
1192-
octal-literal \opt{\terminal{'}} octal-digit
1192+
octal-literal \opt{\literalterminal{'}} octal-digit
11931193
\end{bnf}
11941194

11951195
\begin{bnf}
11961196
\nontermdef{decimal-literal}\br
11971197
nonzero-digit\br
1198-
decimal-literal \opt{\terminal{'}} digit
1198+
decimal-literal \opt{\literalterminal{'}} digit
11991199
\end{bnf}
12001200

12011201
\begin{bnf}
@@ -1226,14 +1226,14 @@
12261226
\begin{bnf}
12271227
\nontermdef{hexadecimal-digit-sequence}\br
12281228
hexadecimal-digit\br
1229-
hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit
1229+
hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit
12301230
\end{bnf}
12311231

12321232
\begin{bnf}
12331233
\nontermdef{hexadecimal-digit} \textnormal{one of}\br
1234-
\terminal{0 1 2 3 4 5 6 7 8 9}\br
1235-
\terminal{a b c d e f}\br
1236-
\terminal{A B C D E F}
1234+
\literalterminal{0 1 2 3 4 5 6 7 8 9}\br
1235+
\literalterminal{a b c d e f}\br
1236+
\literalterminal{A B C D E F}
12371237
\end{bnf}
12381238

12391239
\begin{bnf}
@@ -1248,17 +1248,17 @@
12481248

12491249
\begin{bnf}
12501250
\nontermdef{unsigned-suffix} \textnormal{one of}\br
1251-
\terminal{u U}
1251+
\literalterminal{u U}
12521252
\end{bnf}
12531253

12541254
\begin{bnf}
12551255
\nontermdef{long-suffix} \textnormal{one of}\br
1256-
\terminal{l L}
1256+
\literalterminal{l L}
12571257
\end{bnf}
12581258

12591259
\begin{bnf}
12601260
\nontermdef{long-long-suffix} \textnormal{one of}\br
1261-
\terminal{ll LL}
1261+
\literalterminal{ll LL}
12621262
\end{bnf}
12631263

12641264
\begin{bnf}
@@ -1297,7 +1297,7 @@
12971297

12981298
\pnum
12991299
The \grammarterm{hexadecimal-digit}s
1300-
\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F}
1300+
\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F}
13011301
have decimal values ten through fifteen.
13021302
\begin{example}
13031303
The number twelve can be written \tcode{12}, \tcode{014},
@@ -1341,7 +1341,7 @@
13411341
&
13421342
&
13431343
\tcode{unsigned long long int}\\\hline
1344-
\tcode{u} or \tcode{U} &
1344+
\literaltcode{u} or \literaltcode{U} &
13451345
\tcode{unsigned int} &
13461346
\tcode{unsigned int}\\
13471347
&
@@ -1350,7 +1350,7 @@
13501350
&
13511351
\tcode{unsigned long long int} &
13521352
\tcode{unsigned long long int}\\\hline
1353-
\tcode{l} or \tcode{L} &
1353+
\literaltcode{l} or \literaltcode{L} &
13541354
\tcode{long int} &
13551355
\tcode{long int}\\
13561356
&
@@ -1362,22 +1362,22 @@
13621362
&
13631363
&
13641364
\tcode{unsigned long long int}\\\hline
1365-
Both \tcode{u} or \tcode{U} &
1365+
Both \literaltcode{u} or \literaltcode{U} &
13661366
\tcode{unsigned long int} &
13671367
\tcode{unsigned long int}\\
1368-
and \tcode{l} or \tcode{L} &
1368+
and \literaltcode{l} or \literaltcode{L} &
13691369
\tcode{unsigned long long int} &
13701370
\tcode{unsigned long long int}\\\hline
1371-
\tcode{ll} or \tcode{LL} &
1371+
\literaltcode{ll} or \literaltcode{LL} &
13721372
\tcode{long long int} &
13731373
\tcode{long long int}\\
13741374
&
13751375
&
13761376
\tcode{unsigned long long int}\\\hline
1377-
Both \tcode{u} or \tcode{U} &
1377+
Both \literaltcode{u} or \literaltcode{U} &
13781378
\tcode{unsigned long long int} &
13791379
\tcode{unsigned long long int}\\
1380-
and \tcode{ll} or \tcode{LL} &
1380+
and \literaltcode{ll} or \literaltcode{LL} &
13811381
&
13821382
\\\hline
13831383
\tcode{z} or \tcode{Z} &
@@ -1425,12 +1425,12 @@
14251425
\indextext{literal!character}%
14261426
\begin{bnf}
14271427
\nontermdef{character-literal}\br
1428-
\opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'}
1428+
\opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'}
14291429
\end{bnf}
14301430

14311431
\begin{bnf}
14321432
\nontermdef{encoding-prefix} \textnormal{one of}\br
1433-
\terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L}
1433+
\literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L}
14341434
\end{bnf}
14351435

14361436
\begin{bnf}
@@ -1481,16 +1481,16 @@
14811481

14821482
\begin{bnf}
14831483
\nontermdef{octal-escape-sequence}\br
1484-
\terminal{\textbackslash} octal-digit\br
1485-
\terminal{\textbackslash} octal-digit octal-digit\br
1486-
\terminal{\textbackslash} octal-digit octal-digit octal-digit\br
1487-
\terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}}
1484+
\literalterminal{\textbackslash} octal-digit\br
1485+
\literalterminal{\textbackslash} octal-digit octal-digit\br
1486+
\literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br
1487+
\literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}}
14881488
\end{bnf}
14891489

14901490
\begin{bnf}
14911491
\nontermdef{hexadecimal-escape-sequence}\br
1492-
\terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1493-
\terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}}
1492+
\literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br
1493+
\literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}}
14941494
\end{bnf}
14951495

14961496
\begin{bnf}
@@ -1678,42 +1678,42 @@
16781678

16791679
\begin{bnf}
16801680
\nontermdef{fractional-constant}\br
1681-
\opt{digit-sequence} \terminal{.} digit-sequence\br
1682-
digit-sequence \terminal{.}
1681+
\opt{digit-sequence} \literalterminal{.} digit-sequence\br
1682+
digit-sequence \literalterminal{.}
16831683
\end{bnf}
16841684

16851685
\begin{bnf}
16861686
\nontermdef{hexadecimal-fractional-constant}\br
1687-
\opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br
1688-
hexadecimal-digit-sequence \terminal{.}
1687+
\opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br
1688+
hexadecimal-digit-sequence \literalterminal{.}
16891689
\end{bnf}
16901690

16911691
\begin{bnf}
16921692
\nontermdef{exponent-part}\br
1693-
\terminal{e} \opt{sign} digit-sequence\br
1694-
\terminal{E} \opt{sign} digit-sequence
1693+
\literalterminal{e} \opt{sign} digit-sequence\br
1694+
\literalterminal{E} \opt{sign} digit-sequence
16951695
\end{bnf}
16961696

16971697
\begin{bnf}
16981698
\nontermdef{binary-exponent-part}\br
1699-
\terminal{p} \opt{sign} digit-sequence\br
1700-
\terminal{P} \opt{sign} digit-sequence
1699+
\literalterminal{p} \opt{sign} digit-sequence\br
1700+
\literalterminal{P} \opt{sign} digit-sequence
17011701
\end{bnf}
17021702

17031703
\begin{bnf}
17041704
\nontermdef{sign} \textnormal{one of}\br
1705-
\terminal{+ -}
1705+
\literalterminal{+ -}
17061706
\end{bnf}
17071707

17081708
\begin{bnf}
17091709
\nontermdef{digit-sequence}\br
17101710
digit\br
1711-
digit-sequence \opt{\terminal{'}} digit
1711+
digit-sequence \opt{\literalterminal{'}} digit
17121712
\end{bnf}
17131713

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

17191719
\pnum
@@ -1798,8 +1798,8 @@
17981798
\indextext{literal!string}%
17991799
\begin{bnf}
18001800
\nontermdef{string-literal}\br
1801-
\opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br
1802-
\opt{encoding-prefix} \terminal{R} raw-string
1801+
\opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br
1802+
\opt{encoding-prefix} \literalterminal{R} raw-string
18031803
\end{bnf}
18041804

18051805
\begin{bnf}
@@ -1822,7 +1822,7 @@
18221822

18231823
\begin{bnf}
18241824
\nontermdef{raw-string}\br
1825-
\terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"}
1825+
\literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"}
18261826
\end{bnf}
18271827

18281828
\begin{bnf}
@@ -1909,7 +1909,7 @@
19091909

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

0 commit comments

Comments
 (0)