P3034R1 Module Declarations Shouldn’t be Macros

Signed-off-by: yronglin <[email protected]>

Author: yronglin

clang/lib/Lex/PPDirectives.cpp

@@ -4249,7 +4249,13 @@ void Preprocessor::HandleCXXModuleDirective(Token ModuleTok) {
     DirToks.push_back(Tok);
     break;
   case tok::identifier: {
-    if (LexModuleNameContinue(Tok, UseLoc, Path)) {
+    // C++ [cpp.module]p3: Any preprocessing tokens after the module
+    // preprocessing token in the module directive are processed just as in
+    // normal text.
+    //
+    // P3034R1 Module Declarations Shouldn’t be Macros.
+    if (LexModuleNameContinue(Tok, UseLoc, Path,
+                              /*AllowMacroExpansion=*/false)) {
       if (Tok.isNot(tok::eod))
         CheckEndOfDirective(ModuleTok.getIdentifierInfo()->getName());
       return;

clang/lib/Lex/Preprocessor.cpp

@@ -1168,12 +1168,12 @@ bool Preprocessor::LexModuleNameContinue(Token &Tok, SourceLocation UseLoc,
 ///
 /// At the start of phase 4 an import or module token is treated as starting a
 /// directive and are converted to their respective keywords iff:
-///   • After skipping horizontal whitespace are
-///     • at the start of a logical line, or
-///     • preceded by an 'export' at the start of the logical line.
-///   • Are followed by an identifier pp token (before macro expansion), or
-///     • <, ", or : (but not ::) pp tokens for 'import', or
-///     • ; for 'module'
+///   - After skipping horizontal whitespace are
+///     - at the start of a logical line, or
+///     - preceded by an 'export' at the start of the logical line.
+///   - Are followed by an identifier pp token (before macro expansion), or
+///     - <, ", or : (but not ::) pp tokens for 'import', or
+///     - ; for 'module'
 /// Otherwise the token is treated as an identifier.
 bool Preprocessor::HandleModuleContextualKeyword(
     Token &Result, bool TokAtPhysicalStartOfLine) {