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

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 43e0f034e8..f1ca3fadef 100644
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -676,7 +676,7 @@ Parser::ParseExternalDeclaration(ParsedAttributesWithRange &attrs,
     ParseMicrosoftIfExistsExternalDeclaration();
     return DeclGroupPtrTy();
 
-  case tok::kw___import__:
+  case tok::kw___import_module__:
     return ParseModuleImport();
       
   default:
@@ -1543,7 +1543,8 @@ void Parser::ParseMicrosoftIfExistsExternalDeclaration() {
 }
 
 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.