Skip to content

Commit 91ab4b4

Browse files
authored
[lex.{phases,charset,string}] Fix minor misapplications of P2314R4 (#5040)
Corrects a grammar term plural form, adds missing "R" for raw string literal, and deletes a paragraph that was missed in the main commit (3505e2a) and adjust index entries.
1 parent 35577f5 commit 91ab4b4

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

source/lex.tex

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
\grammarterm{r-char-sequence},
118118
\grammarterm{h-char-sequence}, or
119119
\grammarterm{q-char-sequence},
120-
\grammarterm{universal-character-names} are recognized and
120+
\grammarterm{universal-character-name}s are recognized and
121121
replaced by the designated element of the translation character set.
122122
The process of dividing a source file's
123123
characters into preprocessing tokens is context-dependent.
@@ -267,7 +267,7 @@
267267
U+003B & SEMICOLON & \tcode{;} \\
268268
U+003C & LESS-THAN SIGN & \tcode{<} \\
269269
U+003D & EQUALS SIGN & \tcode{=} \\
270-
U+003E & GREATER-THAN SIGN& \tcode{>} \\
270+
U+003E & GREATER-THAN SIGN & \tcode{>} \\
271271
U+003F & QUESTION MARK & \tcode{?} \\
272272
U+0041 .. U+005A & LATIN CAPITAL LETTER A .. Z & \tcode{A B C D E F G H I J K L M} \\
273273
& & \tcode{N O P Q R S T U V W X Y Z} \\
@@ -1825,7 +1825,7 @@
18251825
(and not the single code unit \tcode{'\textbackslash xAB'}).
18261826
Similarly,
18271827
\begin{codeblock}
1828-
"(\u00)" "41"
1828+
R"(\u00)" "41"
18291829
\end{codeblock}
18301830
represents six characters,
18311831
starting with a backslash and ending with the digit \tcode{1}
@@ -1855,14 +1855,6 @@
18551855
\tcode{"a"} & \tcode{L"b"} & \tcode{L"ab"} \\
18561856
\end{floattable}
18571857

1858-
\pnum
1859-
\indextext{\idxcode{0}|seealso{zero, null}}%
1860-
\indextext{\idxcode{0}!string terminator}%
1861-
\indextext{\idxcode{0}!null character|see {character, null}}%
1862-
In translation phase 6\iref{lex.phases},
1863-
after adjacent \grammarterm{string-literal}s are concatenated,
1864-
a null character is appended to the result.
1865-
18661858
\pnum
18671859
Evaluating a \grammarterm{string-literal} results in a string literal object
18681860
with static storage duration\iref{basic.stc}.
@@ -1877,6 +1869,9 @@
18771869
\end{note}
18781870

18791871
\pnum
1872+
\indextext{\idxcode{0}|seealso{zero, null}}%
1873+
\indextext{\idxcode{0}!string terminator}%
1874+
\indextext{\idxcode{0}!null character|see {character, null}}%
18801875
String literal objects are initialized with
18811876
the sequence of code unit values
18821877
corresponding to the \grammarterm{string-literal}'s sequence of

0 commit comments

Comments
 (0)