Skip to content

Commit 78681d6

Browse files
committed
[lex.header] Modernize text around header names
The footnote better belongs in the main text as a regular note. To make the notes flow consistently, switch the order of the note and normative text in the first paragraph to lead with the normative text. Finally, take this opportunity to clarify the specific characters called out using the Unicode nomenclature used throughout this clause.
1 parent f6b7ef3 commit 78681d6

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

source/lex.tex

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -660,31 +660,32 @@
660660
\end{bnf}
661661

662662
\pnum
663+
The sequences in both forms of \grammarterm{header-name}{s} are mapped in an
664+
\impldef{mapping header name to header or external source file} manner to headers or to
665+
external source file names as specified in~\ref{cpp.include}.
663666
\begin{note}
664-
Header name preprocessing tokens only appear within
667+
Header name preprocessing tokens appear only within
665668
a \tcode{\#include} preprocessing directive,
666669
a \tcode{__has_include} preprocessing expression, or
667670
after certain occurrences of an \tcode{import} token
668671
(see~\ref{lex.pptoken}).
669672
\end{note}
670-
The sequences in both forms of \grammarterm{header-name}{s} are mapped in an
671-
\impldef{mapping header name to header or external source file} manner to headers or to
672-
external source file names as specified in~\ref{cpp.include}.
673673

674674
\pnum
675-
The appearance of either of the characters \tcode{'} or \tcode{\textbackslash} or of
675+
The appearance of either of the characters \unicode{0027}{apostrophe},
676+
\unicode{005c}{reverse solidus}, or of
676677
either of the character sequences \tcode{/*} or \tcode{//} in a
677678
\grammarterm{q-char-sequence} or an \grammarterm{h-char-sequence}
678679
is conditionally-supported with \impldef{meaning of \tcode{'}, \tcode{\textbackslash},
679680
\tcode{/*}, or \tcode{//} in a \grammarterm{q-char-sequence} or an
680681
\grammarterm{h-char-sequence}} semantics, as is the appearance of the character
681-
\tcode{"} in an \grammarterm{h-char-sequence}.
682-
\begin{footnote}
682+
\unicode{0022}{quotation mark} in an \grammarterm{h-char-sequence}.
683+
\begin{note}
683684
Thus, a sequence of characters
684685
that resembles an escape sequence can result in an error, be interpreted as the
685686
character corresponding to the escape sequence, or have a completely different meaning,
686687
depending on the implementation.
687-
\end{footnote}
688+
\end{note}
688689
\indextext{header!name|)}
689690

690691
\rSec1[lex.ppnumber]{Preprocessing numbers}

0 commit comments

Comments
 (0)