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 /include/clang | |
| 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 'include/clang')
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 2 | ||||
| -rw-r--r-- | include/clang/Basic/TokenKinds.def | 2 | ||||
| -rw-r--r-- | include/clang/Lex/Preprocessor.h | 4 | ||||
| -rw-r--r-- | include/clang/Sema/Sema.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 9a6e7545b4..b6039f8e29 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -571,7 +571,7 @@ def err_seh___finally_block : Error< // Modules def err_module_expected_ident : Error< - "expected a module name after '__import__'">; + "expected a module name after '__import_module__'">; def err_module_expected_semi : Error< "expected a semicolon name after module name">; diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def index ccc2e612b2..b5752fe688 100644 --- a/include/clang/Basic/TokenKinds.def +++ b/include/clang/Basic/TokenKinds.def @@ -397,7 +397,7 @@ KEYWORD(__array_extent , KEYCXX) // Apple Extension. KEYWORD(__private_extern__ , KEYALL) -KEYWORD(__import__ , KEYALL) +KEYWORD(__import_module__ , KEYALL) // Microsoft Extension. KEYWORD(__declspec , KEYALL) diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h index c3557a5e93..f2f3f73b9b 100644 --- a/include/clang/Lex/Preprocessor.h +++ b/include/clang/Lex/Preprocessor.h @@ -554,8 +554,8 @@ public: CachingLex(Result); --LexDepth; - // If we have the __import__ keyword, handle the module import now. - if (Result.getKind() == tok::kw___import__ && LexDepth == 0) + // If we have the __import_module__ keyword, handle the module import now. + if (Result.getKind() == tok::kw___import_module__ && LexDepth == 0) HandleModuleImport(Result); } diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 16411a0fe6..e6412d3d45 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -1078,7 +1078,7 @@ public: /// \brief The parser has processed a module import declaration. /// - /// \param ImportLoc The location of the '__import__' keyword. + /// \param ImportLoc The location of the '__import_module__' keyword. /// /// \param ModuleName The name of the module. /// |