|
293 | 293 | \ucode{000c} & \uname{form feed} & \\
|
294 | 294 | \ucode{0020} & \uname{space} & \\
|
295 | 295 | \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} \\ |
333 | 333 | \end{floattable}
|
334 | 334 |
|
335 | 335 | \pnum
|
|
569 | 569 | \item
|
570 | 570 | \indextext{literal!string!raw}%
|
571 | 571 | 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 |
573 | 573 | token shall be a raw string literal. Between the initial and final
|
574 | 574 | double quote characters of the raw string, any transformations performed in phase
|
575 | 575 | 2 (line splicing) are reverted; this reversion
|
576 | 576 | shall apply before any \grammarterm{d-char}, \grammarterm{r-char}, or delimiting
|
577 | 577 | parenthesis is identified. The raw string literal is defined as the shortest sequence
|
578 | 578 | of characters that matches the raw-string pattern
|
579 | 579 | \begin{ncbnf}
|
580 |
| -\opt{encoding-prefix} \terminal{R} raw-string |
| 580 | +\opt{encoding-prefix} \literalterminal{R} raw-string |
581 | 581 | \end{ncbnf}
|
582 | 582 |
|
583 | 583 | \item Otherwise, if the next three characters are \tcode{<::} and the subsequent character
|
|
695 | 695 | \begin{bnf}
|
696 | 696 | \nontermdef{pp-number}\br
|
697 | 697 | digit\br
|
698 |
| - \terminal{.} digit\br |
| 698 | + \literalterminal{.} digit\br |
699 | 699 | 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{.} |
707 | 707 | \end{bnf}
|
708 | 708 |
|
709 | 709 | \pnum
|
|
1128 | 1128 | \nontermdef{binary-literal}\br
|
1129 | 1129 | \terminal{0b} binary-digit\br
|
1130 | 1130 | \terminal{0B} binary-digit\br
|
1131 |
| - binary-literal \opt{\terminal{'}} binary-digit |
| 1131 | + binary-literal \opt{\literalterminal{'}} binary-digit |
1132 | 1132 | \end{bnf}
|
1133 | 1133 |
|
1134 | 1134 | \begin{bnf}
|
1135 | 1135 | \nontermdef{octal-literal}\br
|
1136 | 1136 | \terminal{0}\br
|
1137 |
| - octal-literal \opt{\terminal{'}} octal-digit |
| 1137 | + octal-literal \opt{\literalterminal{'}} octal-digit |
1138 | 1138 | \end{bnf}
|
1139 | 1139 |
|
1140 | 1140 | \begin{bnf}
|
1141 | 1141 | \nontermdef{decimal-literal}\br
|
1142 | 1142 | nonzero-digit\br
|
1143 |
| - decimal-literal \opt{\terminal{'}} digit |
| 1143 | + decimal-literal \opt{\literalterminal{'}} digit |
1144 | 1144 | \end{bnf}
|
1145 | 1145 |
|
1146 | 1146 | \begin{bnf}
|
|
1171 | 1171 | \begin{bnf}
|
1172 | 1172 | \nontermdef{hexadecimal-digit-sequence}\br
|
1173 | 1173 | hexadecimal-digit\br
|
1174 |
| - hexadecimal-digit-sequence \opt{\terminal{'}} hexadecimal-digit |
| 1174 | + hexadecimal-digit-sequence \opt{\literalterminal{'}} hexadecimal-digit |
1175 | 1175 | \end{bnf}
|
1176 | 1176 |
|
1177 | 1177 | \begin{bnf}
|
1178 | 1178 | \nontermdef{hexadecimal-digit} \textnormal{one of}\br
|
1179 |
| - \terminal{0 1 2 3 4 5 6 7 8 9}\br |
1180 |
| - \terminal{a b c d e f}\br |
1181 |
| - \terminal{A B C D E F} |
| 1179 | + \literalterminal{0 1 2 3 4 5 6 7 8 9}\br |
| 1180 | + \literalterminal{a b c d e f}\br |
| 1181 | + \literalterminal{A B C D E F} |
1182 | 1182 | \end{bnf}
|
1183 | 1183 |
|
1184 | 1184 | \begin{bnf}
|
|
1193 | 1193 |
|
1194 | 1194 | \begin{bnf}
|
1195 | 1195 | \nontermdef{unsigned-suffix} \textnormal{one of}\br
|
1196 |
| - \terminal{u U} |
| 1196 | + \literalterminal{u U} |
1197 | 1197 | \end{bnf}
|
1198 | 1198 |
|
1199 | 1199 | \begin{bnf}
|
1200 | 1200 | \nontermdef{long-suffix} \textnormal{one of}\br
|
1201 |
| - \terminal{l L} |
| 1201 | + \literalterminal{l L} |
1202 | 1202 | \end{bnf}
|
1203 | 1203 |
|
1204 | 1204 | \begin{bnf}
|
1205 | 1205 | \nontermdef{long-long-suffix} \textnormal{one of}\br
|
1206 |
| - \terminal{ll LL} |
| 1206 | + \literalterminal{ll LL} |
1207 | 1207 | \end{bnf}
|
1208 | 1208 |
|
1209 | 1209 | \begin{bnf}
|
|
1242 | 1242 |
|
1243 | 1243 | \pnum
|
1244 | 1244 | The \grammarterm{hexadecimal-digit}s
|
1245 |
| -\tcode{a} through \tcode{f} and \tcode{A} through \tcode{F} |
| 1245 | +\literaltcode{a} through \literaltcode{f} and \literaltcode{A} through \literaltcode{F} |
1246 | 1246 | have decimal values ten through fifteen.
|
1247 | 1247 | \begin{example}
|
1248 | 1248 | The number twelve can be written \tcode{12}, \tcode{014},
|
|
1286 | 1286 | &
|
1287 | 1287 | &
|
1288 | 1288 | \tcode{unsigned long long int}\\\hline
|
1289 |
| -\tcode{u} or \tcode{U} & |
| 1289 | +\literaltcode{u} or \literaltcode{U} & |
1290 | 1290 | \tcode{unsigned int} &
|
1291 | 1291 | \tcode{unsigned int}\\
|
1292 | 1292 | &
|
|
1295 | 1295 | &
|
1296 | 1296 | \tcode{unsigned long long int} &
|
1297 | 1297 | \tcode{unsigned long long int}\\\hline
|
1298 |
| -\tcode{l} or \tcode{L} & |
| 1298 | +\literaltcode{l} or \literaltcode{L} & |
1299 | 1299 | \tcode{long int} &
|
1300 | 1300 | \tcode{long int}\\
|
1301 | 1301 | &
|
|
1307 | 1307 | &
|
1308 | 1308 | &
|
1309 | 1309 | \tcode{unsigned long long int}\\\hline
|
1310 |
| -Both \tcode{u} or \tcode{U} & |
| 1310 | +Both \literaltcode{u} or \literaltcode{U} & |
1311 | 1311 | \tcode{unsigned long int} &
|
1312 | 1312 | \tcode{unsigned long int}\\
|
1313 |
| -and \tcode{l} or \tcode{L} & |
| 1313 | +and \literaltcode{l} or \literaltcode{L} & |
1314 | 1314 | \tcode{unsigned long long int} &
|
1315 | 1315 | \tcode{unsigned long long int}\\\hline
|
1316 |
| -\tcode{ll} or \tcode{LL} & |
| 1316 | +\literaltcode{ll} or \literaltcode{LL} & |
1317 | 1317 | \tcode{long long int} &
|
1318 | 1318 | \tcode{long long int}\\
|
1319 | 1319 | &
|
1320 | 1320 | &
|
1321 | 1321 | \tcode{unsigned long long int}\\\hline
|
1322 |
| -Both \tcode{u} or \tcode{U} & |
| 1322 | +Both \literaltcode{u} or \literaltcode{U} & |
1323 | 1323 | \tcode{unsigned long long int} &
|
1324 | 1324 | \tcode{unsigned long long int}\\
|
1325 |
| -and \tcode{ll} or \tcode{LL} & |
| 1325 | +and \literaltcode{ll} or \literaltcode{LL} & |
1326 | 1326 | &
|
1327 | 1327 | \\\hline
|
1328 | 1328 | \tcode{z} or \tcode{Z} &
|
|
1370 | 1370 | \indextext{literal!character}%
|
1371 | 1371 | \begin{bnf}
|
1372 | 1372 | \nontermdef{character-literal}\br
|
1373 |
| - \opt{encoding-prefix} \terminal{'} c-char-sequence \terminal{'} |
| 1373 | + \opt{encoding-prefix} \literalterminal{'} c-char-sequence \literalterminal{'} |
1374 | 1374 | \end{bnf}
|
1375 | 1375 |
|
1376 | 1376 | \begin{bnf}
|
1377 | 1377 | \nontermdef{encoding-prefix} \textnormal{one of}\br
|
1378 |
| - \terminal{u8}\quad\terminal{u}\quad\terminal{U}\quad\terminal{L} |
| 1378 | + \literalterminal{u8}\quad\literalterminal{u}\quad\literalterminal{U}\quad\literalterminal{L} |
1379 | 1379 | \end{bnf}
|
1380 | 1380 |
|
1381 | 1381 | \begin{bnf}
|
|
1426 | 1426 |
|
1427 | 1427 | \begin{bnf}
|
1428 | 1428 | \nontermdef{octal-escape-sequence}\br
|
1429 |
| - \terminal{\textbackslash} octal-digit\br |
1430 |
| - \terminal{\textbackslash} octal-digit octal-digit\br |
1431 |
| - \terminal{\textbackslash} octal-digit octal-digit octal-digit\br |
1432 |
| - \terminal{\textbackslash o\{} simple-octal-digit-sequence \terminal{\}} |
| 1429 | + \literalterminal{\textbackslash} octal-digit\br |
| 1430 | + \literalterminal{\textbackslash} octal-digit octal-digit\br |
| 1431 | + \literalterminal{\textbackslash} octal-digit octal-digit octal-digit\br |
| 1432 | + \literalterminal{\textbackslash o\{} simple-octal-digit-sequence \literalterminal{\}} |
1433 | 1433 | \end{bnf}
|
1434 | 1434 |
|
1435 | 1435 | \begin{bnf}
|
1436 | 1436 | \nontermdef{hexadecimal-escape-sequence}\br
|
1437 |
| - \terminal{\textbackslash x} simple-hexadecimal-digit-sequence\br |
1438 |
| - \terminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \terminal{\}} |
| 1437 | + \literalterminal{\textbackslash x} simple-hexadecimal-digit-sequence\br |
| 1438 | + \literalterminal{\textbackslash x\{} simple-hexadecimal-digit-sequence \literalterminal{\}} |
1439 | 1439 | \end{bnf}
|
1440 | 1440 |
|
1441 | 1441 | \begin{bnf}
|
|
1623 | 1623 |
|
1624 | 1624 | \begin{bnf}
|
1625 | 1625 | \nontermdef{fractional-constant}\br
|
1626 |
| - \opt{digit-sequence} \terminal{.} digit-sequence\br |
1627 |
| - digit-sequence \terminal{.} |
| 1626 | + \opt{digit-sequence} \literalterminal{.} digit-sequence\br |
| 1627 | + digit-sequence \literalterminal{.} |
1628 | 1628 | \end{bnf}
|
1629 | 1629 |
|
1630 | 1630 | \begin{bnf}
|
1631 | 1631 | \nontermdef{hexadecimal-fractional-constant}\br
|
1632 |
| - \opt{hexadecimal-digit-sequence} \terminal{.} hexadecimal-digit-sequence\br |
1633 |
| - hexadecimal-digit-sequence \terminal{.} |
| 1632 | + \opt{hexadecimal-digit-sequence} \literalterminal{.} hexadecimal-digit-sequence\br |
| 1633 | + hexadecimal-digit-sequence \literalterminal{.} |
1634 | 1634 | \end{bnf}
|
1635 | 1635 |
|
1636 | 1636 | \begin{bnf}
|
1637 | 1637 | \nontermdef{exponent-part}\br
|
1638 |
| - \terminal{e} \opt{sign} digit-sequence\br |
1639 |
| - \terminal{E} \opt{sign} digit-sequence |
| 1638 | + \literalterminal{e} \opt{sign} digit-sequence\br |
| 1639 | + \literalterminal{E} \opt{sign} digit-sequence |
1640 | 1640 | \end{bnf}
|
1641 | 1641 |
|
1642 | 1642 | \begin{bnf}
|
1643 | 1643 | \nontermdef{binary-exponent-part}\br
|
1644 |
| - \terminal{p} \opt{sign} digit-sequence\br |
1645 |
| - \terminal{P} \opt{sign} digit-sequence |
| 1644 | + \literalterminal{p} \opt{sign} digit-sequence\br |
| 1645 | + \literalterminal{P} \opt{sign} digit-sequence |
1646 | 1646 | \end{bnf}
|
1647 | 1647 |
|
1648 | 1648 | \begin{bnf}
|
1649 | 1649 | \nontermdef{sign} \textnormal{one of}\br
|
1650 |
| - \terminal{+ -} |
| 1650 | + \literalterminal{+ -} |
1651 | 1651 | \end{bnf}
|
1652 | 1652 |
|
1653 | 1653 | \begin{bnf}
|
1654 | 1654 | \nontermdef{digit-sequence}\br
|
1655 | 1655 | digit\br
|
1656 |
| - digit-sequence \opt{\terminal{'}} digit |
| 1656 | + digit-sequence \opt{\literalterminal{'}} digit |
1657 | 1657 | \end{bnf}
|
1658 | 1658 |
|
1659 | 1659 | \begin{bnf}
|
1660 | 1660 | \nontermdef{floating-point-suffix} \textnormal{one of}\br
|
1661 |
| - \terminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16} |
| 1661 | + \literalterminal{f l f16 f32 f64 f128 bf16 F L F16 F32 F64 F128 BF16} |
1662 | 1662 | \end{bnf}
|
1663 | 1663 |
|
1664 | 1664 | \pnum
|
|
1743 | 1743 | \indextext{literal!string}%
|
1744 | 1744 | \begin{bnf}
|
1745 | 1745 | \nontermdef{string-literal}\br
|
1746 |
| - \opt{encoding-prefix} \terminal{"} \opt{s-char-sequence} \terminal{"}\br |
1747 |
| - \opt{encoding-prefix} \terminal{R} raw-string |
| 1746 | + \opt{encoding-prefix} \literalterminal{"} \opt{s-char-sequence} \literalterminal{"}\br |
| 1747 | + \opt{encoding-prefix} \literalterminal{R} raw-string |
1748 | 1748 | \end{bnf}
|
1749 | 1749 |
|
1750 | 1750 | \begin{bnf}
|
|
1767 | 1767 |
|
1768 | 1768 | \begin{bnf}
|
1769 | 1769 | \nontermdef{raw-string}\br
|
1770 |
| - \terminal{"} \opt{d-char-sequence} \terminal{(} \opt{r-char-sequence} \terminal{)} \opt{d-char-sequence} \terminal{"} |
| 1770 | + \literalterminal{"} \opt{d-char-sequence} \literalterminal{(} \opt{r-char-sequence} \literalterminal{)} \opt{d-char-sequence} \literalterminal{"} |
1771 | 1771 | \end{bnf}
|
1772 | 1772 |
|
1773 | 1773 | \begin{bnf}
|
|
1854 | 1854 |
|
1855 | 1855 | \pnum
|
1856 | 1856 | \indextext{literal!string!raw}%
|
1857 |
| -A \grammarterm{string-literal} that has an \tcode{R} |
| 1857 | +A \grammarterm{string-literal} that has an \literaltcode{R} |
1858 | 1858 | \indextext{prefix!\idxcode{R}}%
|
1859 | 1859 | in the prefix is a \defn{raw string literal}. The
|
1860 | 1860 | \grammarterm{d-char-sequence} serves as a delimiter. The terminating
|
|
0 commit comments