Handle c++ operator keyword after module/import

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

Author: yronglin

clang/lib/Lex/Preprocessor.cpp

@@ -1199,12 +1199,22 @@ bool Preprocessor::HandleModuleContextualKeyword(
   llvm::SaveAndRestore<bool> SavedParsingPreprocessorDirective(
       CurPPLexer->ParsingPreprocessorDirective, true);
 
+  // The next token may be an angled string literal after import keyword.
+  llvm::SaveAndRestore<bool> SavedParsingFilemame(
+      CurPPLexer->ParsingFilename,
+      Result.getIdentifierInfo()->isModulesImport());
+
+  std::optional<Token> NextTok =
+      CurLexer ? CurLexer->peekNextPPToken() : CurTokenLexer->peekNextPPToken();
+  if (!NextTok)
+    return false;
+
+  if (NextTok->is(tok::raw_identifier))
+    LookUpIdentifierInfo(*NextTok);
+
   if (Result.getIdentifierInfo()->isModulesImport()) {
-    // The next token may be an angled string literal.
-    llvm::SaveAndRestore<bool> SavedParsingFilemame(CurPPLexer->ParsingFilename,
-                                                    true);
-    if (isNextPPTokenOneOf(tok::raw_identifier, tok::less, tok::string_literal,
-                           tok::colon, tok::header_name)) {
+    if (NextTok->isOneOf(tok::identifier, tok::less, tok::string_literal,
+                         tok::colon, tok::header_name)) {
       Result.setKind(tok::kw_import);
       ModuleImportLoc = Result.getLocation();
       IsAtImport = false;
@@ -1213,7 +1223,7 @@ bool Preprocessor::HandleModuleContextualKeyword(
   }
 
   if (Result.getIdentifierInfo()->isModulesDeclaration() &&
-      isNextPPTokenOneOf(tok::raw_identifier, tok::colon, tok::semi)) {
+      NextTok->isOneOf(tok::identifier, tok::colon, tok::semi)) {
     Result.setKind(tok::kw_module);
     ModuleDeclLoc = Result.getLocation();
     return true;

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

@@ -22,6 +22,8 @@
 // RUN: %clang_cc1 -std=c++20 %t/not_import.cpp -fsyntax-only -verify
 // RUN: %clang_cc1 -std=c++20 %t/import_spaceship.cpp -fsyntax-only -verify
 // RUN: %clang_cc1 -std=c++20 %t/leading_empty_macro.cpp -fsyntax-only -verify
+// RUN: %clang_cc1 -std=c++20 %t/operator_keyword_and.cpp -fsyntax-only -verify
+// RUN: %clang_cc1 -std=c++20 %t/operator_keyword_and2.cpp -fsyntax-only -verify
 
 
 //--- hash.cpp
@@ -88,3 +90,15 @@ export module M;
 typedef int import;
 #define EMP
 EMP import m; // The phase 7 grammar should see import as a typedef-name.
+
+//--- operator_keyword_and.cpp
+// expected-no-diagnostics
+typedef int import;
+extern
+import and x;
+
+//--- operator_keyword_and2.cpp
+// expected-no-diagnostics
+typedef int module;
+extern
+module and x;