Merge 2024-03 CWG Motion 5

P3034R1 Module Declarations Shouldn’t be Macros

Author: tkoeppe

source/preprocessor.tex

@@ -759,6 +759,32 @@
 or (if it is the first token of the \grammarterm{pp-module}) \tcode{export}
 is an identifier defined as an object-like macro.
 
+\pnum
+The \grammarterm{pp-tokens}, if any, of a \grammarterm{pp-module}
+shall be of the form:
+\begin{ncsimplebnf}
+pp-module-name \opt{pp-module-partition} \opt{pp-tokens}
+\end{ncsimplebnf}
+where the \grammarterm{pp-tokens} (if any) shall not begin with
+a \tcode{(} preprocessing token and
+the grammar non-terminals are defined as:
+\begin{ncbnf}
+\nontermdef{pp-module-name}\br
+    \opt{pp-module-name-qualifier} identifier
+\end{ncbnf}
+\begin{ncbnf}
+\nontermdef{pp-module-partition}\br
+    \terminal{:} \opt{pp-module-name-qualifier} identifier
+\end{ncbnf}
+\begin{ncbnf}
+\nontermdef{pp-module-name-qualifier}\br
+    identifier \terminal{.}\br
+    pp-module-name-qualifier identifier \terminal{.}
+\end{ncbnf}
+No \grammarterm{identifier} in
+the \grammarterm{pp-module-name} or \grammarterm{pp-module-partition}
+shall currently be defined as an object-like macro.
+
 \pnum
 Any preprocessing tokens after the \tcode{module} preprocessing token
 in the \tcode{module} directive are processed just as in normal text.