diff options
author | Douglas Gregor <dgregor@apple.com> | 2011-08-31 18:19:09 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2011-08-31 18:19:09 +0000 |
commit | 65030af6526748ce11534e92f0ccefc44091ba13 (patch) | |
tree | eeed9bb3744e31b499e15c8169a653f05a1bdc26 /lib/Lex/Preprocessor.cpp | |
parent | 140ab234c23f392d5422691c5de1ee3c15026def (diff) |
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
Diffstat (limited to 'lib/Lex/Preprocessor.cpp')
-rw-r--r-- | lib/Lex/Preprocessor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index 51908bdb87..65a5b99ca1 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -513,7 +513,7 @@ void Preprocessor::HandleIdentifier(Token &Identifier) { 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 @@ void Preprocessor::HandleModuleImport(Token &Import) { *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) { |