CWG3078 Different treatment of #include pp-tokens and header-name-tokens

Author: eisenwave

source/lex.tex

@@ -831,11 +831,11 @@
 \pnum
 In all respects of the language, each alternative token behaves the
 same, respectively, as its primary token, except for its spelling.
-\begin{footnote}
-Thus the ``stringized'' values\iref{cpp.stringize} of
-\tcode{[} and \tcode{<:} will be different, maintaining the source
-spelling, but the tokens can otherwise be freely interchanged.
-\end{footnote}
+\begin{note}
+The ``stringized'' values\iref{cpp.stringize} of
+\tcode{[} and \tcode{<:} are different,
+maintaining the source spelling.
+\end{note}
 The set of alternative tokens is defined in
 \tref{lex.digraph}.
 

source/preprocessor.tex

@@ -353,7 +353,7 @@
 
 \begin{bnf}
 \nontermdef{header-name-tokens}\br
-    string-literal\br
+    plain-string-literal\br
     \terminal{<} h-pp-tokens \terminal{>}
 \end{bnf}
 
@@ -756,12 +756,13 @@
 in the directive are processed just as in normal text
 (i.e., each identifier currently defined as a macro name is replaced by its
 replacement list of preprocessing tokens).
-After replacement,
-if the first preprocessing token is a \grammarterm{string-literal},
-it shall be a \grammarterm{plain-string-literal}.
-Then, an attempt is made to form a \grammarterm{header-name}
+The resulting sequence of preprocessing tokens shall be of the form
+\begin{ncsimplebnf}
+header-name-tokens
+\end{ncsimplebnf}
+An attempt is then made to form a \grammarterm{header-name}
 preprocessing token\iref{lex.header} from the whitespace and the characters
-of the spellings of the resulting sequence of preprocessing tokens;
+of the spellings of the \grammarterm{header-name-tokens};
 the treatment of whitespace
 is \impldef{treatment of whitespace when processing a \tcode{\#include} directive}.
 If the attempt succeeds, the directive with the so-formed \grammarterm{header-name}