From c1e4dd0e8e6ec8b638bc87ee6dd55f114a4d0e2f Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Thu, 1 Mar 2012 22:07:04 +0000 Subject: Change @import to @__experimental_modules_import. We are not ready to commit to a particular syntax for modules, and don't have time to push it forward in the near future. llvm-svn: 151841 --- clang/lib/Lex/Preprocessor.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'clang/lib/Lex/Preprocessor.cpp') diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index 96dfe360069..b6ea65de499 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -565,13 +565,13 @@ void Preprocessor::HandleIdentifier(Token &Identifier) { if (II.isExtensionToken() && !DisableMacroExpansion) Diag(Identifier, diag::ext_token_used); - // If this is the 'import' contextual keyword, note that the next token - // indicates a module name. + // If this is the '__experimental_modules_import' contextual keyword, note + // that the next token indicates a module name. // - // Note that we do not treat 'import' as a contextual keyword when we're - // in a caching lexer, because caching lexers only get used in contexts where - // import declarations are disallowed. - if (II.isImport() && !InMacroArgs && !DisableMacroExpansion && + // Note that we do not treat '__experimental_modules_import' as a contextual + // keyword when we're in a caching lexer, because caching lexers only get + // used in contexts where import declarations are disallowed. + if (II.isModulesImport() && !InMacroArgs && !DisableMacroExpansion && getLangOptions().Modules && CurLexerKind != CLK_CachingLexer) { ModuleImportLoc = Identifier.getLocation(); ModuleImportPath.clear(); -- cgit v1.2.3