Switch __import__ over to __import_module__, so we don't conflict with
existing practice with Python extension modules. Not that Python
extension modules should be using a double-underscored identifier
anyway, but...
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138870 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 51908bd..65a5b99 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -513,7 +513,7 @@
void Preprocessor::HandleModuleImport(Token &Import) {
// The token sequence
//
- // __import__ identifier
+ // __import_module__ identifier
//
// indicates a module import directive. We load the module and then
// leave the token sequence for the parser.
@@ -525,10 +525,10 @@
*ModuleNameTok.getIdentifierInfo(),
ModuleNameTok.getLocation());
- // FIXME: Transmogrify __import__ into some kind of AST-only __import__ that
- // is not recognized by the preprocessor but is recognized by the parser.
- // It would also be useful to stash the ModuleKey somewhere, so we don't try
- // to load the module twice.
+ // FIXME: Transmogrify __import_module__ into some kind of AST-only
+ // __import_module__ that is not recognized by the preprocessor but is
+ // recognized by the parser. It would also be useful to stash the ModuleKey
+ // somewhere, so we don't try to load the module twice.
}
void Preprocessor::AddCommentHandler(CommentHandler *Handler) {
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 43e0f03..f1ca3fa 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -676,7 +676,7 @@
ParseMicrosoftIfExistsExternalDeclaration();
return DeclGroupPtrTy();
- case tok::kw___import__:
+ case tok::kw___import_module__:
return ParseModuleImport();
default:
@@ -1543,7 +1543,8 @@
}
Parser::DeclGroupPtrTy Parser::ParseModuleImport() {
- assert(Tok.is(tok::kw___import__) && "Improper start to module import");
+ assert(Tok.is(tok::kw___import_module__) &&
+ "Improper start to module import");
SourceLocation ImportLoc = ConsumeToken();
// Parse the module name.