Refine err_invalid_module_or_import_directive and comments in Lexer.cpp

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

Author: yronglin

clang/include/clang/Basic/DiagnosticParseKinds.td

@@ -1780,11 +1780,11 @@ def ext_bit_int : Extension<
 let CategoryName = "Modules Issue" in {
 def err_invalid_module_or_import_directive : Error<
   "the %select{module|import}0 directive is ill-formed, "
-  "%select{module contextual keyword must be immediately "
+  "%select{module keyword must be immediately "
   "followed on the same line by an identifier, "
   "or a ';' after being at the start of a line, or preceded by "
   "an export keyword at the start of a line|"
-  "import contextual keyword must be immediately followed "
+  "import keyword must be immediately followed "
   "on the same line by an identifier, '<', '\"', or ':', but not '::', "
   "after being at the start of a line or preceded by an export at "
   "the start of the line}0">;

clang/lib/Lex/Lexer.cpp

@@ -4041,13 +4041,9 @@ bool Lexer::LexTokenInternal(Token &Result, bool TokAtPhysicalStartOfLine) {
     MIOpt.ReadToken();
     bool returnedToken = LexIdentifierContinue(Result, CurPtr);
 
-    // Check eof token first, because eof token may be encountered in
-    // LexIdentifierContinue, and the current lexer will be deleted in
-    // HandleEndOfFile, causing members(eg. LangOpts) to become an inaccessible
-    // dangling reference.
-    //
-    // FIXME: Whether a more reasonable memory management method needed? such as
-    // delaying the deletion of the current Lexer.
+    // Check eof token first, because EOF may be encountered in
+    // LexIdentifierContinue, and the current lexer may then be made invalid by
+    // HandleEndOfFile.
     if (returnedToken && Result.isNot(tok::eof) &&
         Result.isModuleContextualKeyword(LangOpts) && !LexingRawMode &&
         !Is_PragmaLexer && !ParsingPreprocessorDirective && PP &&

clang/test/CXX/module/cpp.pre/p1.cpp

@@ -54,19 +54,19 @@ import rightpad;        // preprocessing directive
 import :part;           // preprocessing directive
 
 //--- module_decl_not_in_same_line.cpp
-module                  // expected-error {{the module directive is ill-formed, module contextual keyword must be immediately followed on the same line by an identifier, or a ';' after being at the start of a line, or preceded by an export keyword at the start of a line}}
-;export module M;       // expected-error {{the module directive is ill-formed, module contextual keyword must be immediately followed on the same line by an identifier, or a ';' after being at the start of a line, or preceded by an export keyword at the start of a line}}
+module                  // expected-error {{the module directive is ill-formed, module keyword must be immediately followed on the same line by an identifier, or a ';' after being at the start of a line, or preceded by an export keyword at the start of a line}}
+;export module M;       // expected-error {{the module directive is ill-formed, module keyword must be immediately followed on the same line by an identifier, or a ';' after being at the start of a line, or preceded by an export keyword at the start of a line}}
 
 //--- foo.cppm
 export module foo;
 
 //--- import_decl_not_in_same_line.cpp
 export module M;
-export                  // expected-error {{the import directive is ill-formed, import contextual keyword must be immediately followed on the same line by an identifier, '<', '"', or ':', but not '::', after being at the start of a line or preceded by an export at the start of the line}}
+export                  // expected-error {{the import directive is ill-formed, import keyword must be immediately followed on the same line by an identifier, '<', '"', or ':', but not '::', after being at the start of a line or preceded by an export at the start of the line}}
 import
 foo;
 
-export                  // expected-error {{the import directive is ill-formed, import contextual keyword must be immediately followed on the same line by an identifier, '<', '"', or ':', but not '::', after being at the start of a line or preceded by an export at the start of the line}}
+export                  // expected-error {{the import directive is ill-formed, import keyword must be immediately followed on the same line by an identifier, '<', '"', or ':', but not '::', after being at the start of a line or preceded by an export at the start of the line}}
 import foo;
 
 //--- not_import.cpp