[cfe-commits] r151841 - in /cfe/trunk: include/clang/AST/ include/clang/Basic/ lib/AST/ lib/Basic/ lib/Lex/ lib/Parse/ test/Index/ test/Modules/ test/Modules/Inputs/ test/Modules/Inputs/MutuallyRecursive1.framework/Headers/ test/Modules/Inputs/MutuallyRecursive2.framework/Headers/ test/Modules/Inputs/wildcard-submodule-exports/
Ted Kremenek
kremenek at apple.com
Thu Mar 1 14:07:05 PST 2012
Author: kremenek
Date: Thu Mar 1 16:07:04 2012
New Revision: 151841
URL: http://llvm.org/viewvc/llvm-project?rev=151841&view=rev
Log:
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.
Modified:
cfe/trunk/include/clang/AST/Decl.h
cfe/trunk/include/clang/Basic/IdentifierTable.h
cfe/trunk/include/clang/Basic/TokenKinds.def
cfe/trunk/lib/AST/DeclPrinter.cpp
cfe/trunk/lib/Basic/IdentifierTable.cpp
cfe/trunk/lib/Lex/PPDirectives.cpp
cfe/trunk/lib/Lex/Preprocessor.cpp
cfe/trunk/lib/Parse/ParseObjc.cpp
cfe/trunk/lib/Parse/Parser.cpp
cfe/trunk/test/Index/complete-modules.m
cfe/trunk/test/Index/crash-recovery-modules.m
cfe/trunk/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h
cfe/trunk/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h
cfe/trunk/test/Modules/Inputs/category_bottom.h
cfe/trunk/test/Modules/Inputs/category_left.h
cfe/trunk/test/Modules/Inputs/category_other.h
cfe/trunk/test/Modules/Inputs/category_right.h
cfe/trunk/test/Modules/Inputs/diamond.h
cfe/trunk/test/Modules/Inputs/diamond_bottom.h
cfe/trunk/test/Modules/Inputs/diamond_left.h
cfe/trunk/test/Modules/Inputs/diamond_right.h
cfe/trunk/test/Modules/Inputs/namespaces-left.h
cfe/trunk/test/Modules/Inputs/namespaces-right.h
cfe/trunk/test/Modules/Inputs/redecl-merge-bottom.h
cfe/trunk/test/Modules/Inputs/redecl-merge-left-left.h
cfe/trunk/test/Modules/Inputs/redecl-merge-left.h
cfe/trunk/test/Modules/Inputs/redecl-merge-right.h
cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_one.h
cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_two.h
cfe/trunk/test/Modules/compiler_builtins.m
cfe/trunk/test/Modules/cstd.m
cfe/trunk/test/Modules/cycles.c
cfe/trunk/test/Modules/decldef.mm
cfe/trunk/test/Modules/diamond.c
cfe/trunk/test/Modules/header-import.m
cfe/trunk/test/Modules/inferred-submodules.m
cfe/trunk/test/Modules/irgen.c
cfe/trunk/test/Modules/load_failure.c
cfe/trunk/test/Modules/lookup.cpp
cfe/trunk/test/Modules/lookup.m
cfe/trunk/test/Modules/macros.c
cfe/trunk/test/Modules/method_pool.m
cfe/trunk/test/Modules/module-private.cpp
cfe/trunk/test/Modules/namespaces.cpp
cfe/trunk/test/Modules/normal-module-map.cpp
cfe/trunk/test/Modules/objc-categories.m
cfe/trunk/test/Modules/on-demand-build-warnings.m
cfe/trunk/test/Modules/on-demand-build.m
cfe/trunk/test/Modules/on-demand-macros.m
cfe/trunk/test/Modules/redecl-merge.m
cfe/trunk/test/Modules/redeclarations.m
cfe/trunk/test/Modules/requires.m
cfe/trunk/test/Modules/subframeworks.m
cfe/trunk/test/Modules/submodules-preprocess.cpp
cfe/trunk/test/Modules/submodules.cpp
cfe/trunk/test/Modules/submodules.m
cfe/trunk/test/Modules/wildcard-submodule-exports.cpp
Modified: cfe/trunk/include/clang/AST/Decl.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Decl.h (original)
+++ cfe/trunk/include/clang/AST/Decl.h Thu Mar 1 16:07:04 2012
@@ -3168,7 +3168,7 @@
///
/// An import declaration imports the named module (or submodule). For example:
/// \code
-/// @import std.vector;
+/// @__experimental_modules_import std.vector;
/// \endcode
///
/// Import declarations can also be implicitly generated from #include/#import
Modified: cfe/trunk/include/clang/Basic/IdentifierTable.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/IdentifierTable.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/IdentifierTable.h (original)
+++ cfe/trunk/include/clang/Basic/IdentifierTable.h Thu Mar 1 16:07:04 2012
@@ -67,7 +67,7 @@
bool OutOfDate : 1; // True if there may be additional
// information about this identifier
// stored externally.
- bool IsImport : 1; // True if this is the 'import' contextual
+ bool IsModulesImport : 1; // True if this is the 'import' contextual
// keyword.
// 1 bit left in 32-bit word.
@@ -283,12 +283,14 @@
RecomputeNeedsHandleIdentifier();
}
- /// \brief Determine whether this is the contextual keyword 'import'.
- bool isImport() const { return IsImport; }
-
- /// \brief Set whether this identifier is the contextual keyword 'import'.
- void setImport(bool I) {
- IsImport = I;
+ /// \brief Determine whether this is the contextual keyword
+ /// '__experimental_modules_import'.
+ bool isModulesImport() const { return IsModulesImport; }
+
+ /// \brief Set whether this identifier is the contextual keyword
+ /// '__experimental_modules_import'.
+ void setModulesImport(bool I) {
+ IsModulesImport = I;
if (I)
NeedsHandleIdentifier = true;
else
@@ -307,7 +309,7 @@
NeedsHandleIdentifier =
(isPoisoned() | hasMacroDefinition() | isCPlusPlusOperatorKeyword() |
isExtensionToken() | isCXX11CompatKeyword() || isOutOfDate() ||
- isImport());
+ isModulesImport());
}
};
@@ -458,9 +460,10 @@
// contents.
II->Entry = &Entry;
- // If this is the 'import' contextual keyword, mark it as such.
- if (Name.equals("import"))
- II->setImport(true);
+ // If this is the '__experimental_modules_import' contextual keyword,
+ // mark it as such.
+ if (Name.equals("__experimental_modules_import"))
+ II->setModulesImport(true);
return *II;
}
@@ -496,7 +499,7 @@
// If this is the 'import' contextual keyword, mark it as such.
if (Name.equals("import"))
- II->setImport(true);
+ II->setModulesImport(true);
}
return *II;
Modified: cfe/trunk/include/clang/Basic/TokenKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TokenKinds.def?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/TokenKinds.def (original)
+++ cfe/trunk/include/clang/Basic/TokenKinds.def Thu Mar 1 16:07:04 2012
@@ -549,7 +549,7 @@
OBJC2_AT_KEYWORD(optional)
OBJC2_AT_KEYWORD(synthesize)
OBJC2_AT_KEYWORD(dynamic)
-OBJC2_AT_KEYWORD(import)
+OBJC2_AT_KEYWORD(__experimental_modules_import)
// TODO: What to do about context-sensitive keywords like:
// bycopy/byref/in/inout/oneway/out?
Modified: cfe/trunk/lib/AST/DeclPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclPrinter.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/lib/AST/DeclPrinter.cpp (original)
+++ cfe/trunk/lib/AST/DeclPrinter.cpp Thu Mar 1 16:07:04 2012
@@ -650,7 +650,7 @@
}
void DeclPrinter::VisitImportDecl(ImportDecl *D) {
- Out << "@import " << D->getImportedModule()->getFullModuleName()
+ Out << "@__experimental_modules_import " << D->getImportedModule()->getFullModuleName()
<< ";\n";
}
Modified: cfe/trunk/lib/Basic/IdentifierTable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/IdentifierTable.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/IdentifierTable.cpp (original)
+++ cfe/trunk/lib/Basic/IdentifierTable.cpp Thu Mar 1 16:07:04 2012
@@ -41,7 +41,7 @@
ChangedAfterLoad = false;
RevertedTokenID = false;
OutOfDate = false;
- IsImport = false;
+ IsModulesImport = false;
FETokenInfo = 0;
Entry = 0;
}
Modified: cfe/trunk/lib/Lex/PPDirectives.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPDirectives.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPDirectives.cpp (original)
+++ cfe/trunk/lib/Lex/PPDirectives.cpp Thu Mar 1 16:07:04 2012
@@ -1401,7 +1401,7 @@
Diag(HashLoc, diag::warn_auto_module_import)
<< IncludeKind << PathString
<< FixItHint::CreateReplacement(ReplaceRange,
- "@import " + PathString.str().str() + ";");
+ "@__experimental_modules_import " + PathString.str().str() + ";");
}
// Load the module.
Modified: cfe/trunk/lib/Lex/Preprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/Preprocessor.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/Preprocessor.cpp (original)
+++ cfe/trunk/lib/Lex/Preprocessor.cpp Thu Mar 1 16:07:04 2012
@@ -565,13 +565,13 @@
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();
Modified: cfe/trunk/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/lib/Parse/ParseObjc.cpp Thu Mar 1 16:07:04 2012
@@ -64,7 +64,7 @@
case tok::objc_dynamic:
SingleDecl = ParseObjCPropertyDynamic(AtLoc);
break;
- case tok::objc_import:
+ case tok::objc___experimental_modules_import:
if (getLang().Modules)
return ParseModuleImport(AtLoc);
Modified: cfe/trunk/lib/Parse/Parser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Parser.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/Parser.cpp (original)
+++ cfe/trunk/lib/Parse/Parser.cpp Thu Mar 1 16:07:04 2012
@@ -1609,7 +1609,7 @@
}
Parser::DeclGroupPtrTy Parser::ParseModuleImport(SourceLocation AtLoc) {
- assert(Tok.isObjCAtKeyword(tok::objc_import) &&
+ assert(Tok.isObjCAtKeyword(tok::objc___experimental_modules_import) &&
"Improper start to module import");
SourceLocation ImportLoc = ConsumeToken();
Modified: cfe/trunk/test/Index/complete-modules.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/complete-modules.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Index/complete-modules.m (original)
+++ cfe/trunk/test/Index/complete-modules.m Thu Mar 1 16:07:04 2012
@@ -1,14 +1,14 @@
// Note: the run lines follow their respective tests, since line/column
// matter in this test.
- at import LibA.Extensions;
+ at __experimental_modules_import LibA.Extensions;
// RUN: rm -rf %t
-// RUN: c-index-test -code-completion-at=%s:4:9 -fmodule-cache-path %t -fmodules -F %S/Inputs/Frameworks -I %S/Inputs/Headers %s | FileCheck -check-prefix=CHECK-TOP-LEVEL %s
+// RUN: c-index-test -code-completion-at=%s:4:32 -fmodule-cache-path %t -fmodules -F %S/Inputs/Frameworks -I %S/Inputs/Headers %s | FileCheck -check-prefix=CHECK-TOP-LEVEL %s
// CHECK-TOP-LEVEL: NotImplemented:{TypedText Framework} (50)
// CHECK-TOP-LEVEL: NotImplemented:{TypedText LibA} (50)
// CHECK-TOP-LEVEL: NotImplemented:{TypedText nested} (50)
-// RUN: c-index-test -code-completion-at=%s:4:14 -fmodule-cache-path %t -fmodules -F %S/Inputs/Frameworks -I %S/Inputs/Headers %s | FileCheck -check-prefix=CHECK-LIBA %s
+// RUN: c-index-test -code-completion-at=%s:4:37 -fmodule-cache-path %t -fmodules -F %S/Inputs/Frameworks -I %S/Inputs/Headers %s | FileCheck -check-prefix=CHECK-LIBA %s
// CHECK-LIBA: NotImplemented:{TypedText Extensions} (50)
Modified: cfe/trunk/test/Index/crash-recovery-modules.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/crash-recovery-modules.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Index/crash-recovery-modules.m (original)
+++ cfe/trunk/test/Index/crash-recovery-modules.m Thu Mar 1 16:07:04 2012
@@ -4,7 +4,7 @@
// Parse the file, such that building the module will cause Clang to crash.
// RUN: not env CINDEXTEST_FAILONERROR=1 c-index-test -test-load-source all -fmodules -fmodule-cache-path %t -Xclang -fdisable-module-hash -I %S/Inputs/Headers -DCRASH %s 2> %t.err
// RUN: FileCheck < %t.err -check-prefix=CHECK-CRASH %s
-// CHECK-CRASH: crash-recovery-modules.m:16:9:{16:2-16:14}: fatal error: could not build module 'Crash'
+// CHECK-CRASH: crash-recovery-modules.m:16:32:{16:2-16:37}: fatal error: could not build module 'Crash'
// Parse the file again, without crashing, to make sure that
// subsequent parses do the right thing.
@@ -13,7 +13,7 @@
// REQUIRES: crash-recovery
// REQUIRES: shell
- at import Crash;
+ at __experimental_modules_import Crash;
void test() {
const char* error = getCrashString();
Modified: cfe/trunk/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h (original)
+++ cfe/trunk/test/Modules/Inputs/MutuallyRecursive1.framework/Headers/MutuallyRecursive1.h Thu Mar 1 16:07:04 2012
@@ -1,3 +1,3 @@
- at import MutuallyRecursive2;
+ at __experimental_modules_import MutuallyRecursive2;
Modified: cfe/trunk/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h (original)
+++ cfe/trunk/test/Modules/Inputs/MutuallyRecursive2.framework/Headers/MutuallyRecursive2.h Thu Mar 1 16:07:04 2012
@@ -1,6 +1,6 @@
- at import MutuallyRecursive1;
+ at __experimental_modules_import MutuallyRecursive1;
Modified: cfe/trunk/test/Modules/Inputs/category_bottom.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/category_bottom.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/category_bottom.h (original)
+++ cfe/trunk/test/Modules/Inputs/category_bottom.h Thu Mar 1 16:07:04 2012
@@ -1,10 +1,10 @@
- at import category_left;
+ at __experimental_modules_import category_left;
@interface Foo(Bottom)
-(void)bottom;
@end
- at import category_right;
+ at __experimental_modules_import category_right;
@interface LeftFoo(Bottom)
-(void)bottom;
Modified: cfe/trunk/test/Modules/Inputs/category_left.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/category_left.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/category_left.h (original)
+++ cfe/trunk/test/Modules/Inputs/category_left.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import category_top;
+ at __experimental_modules_import category_top;
@interface Foo(Left)
-(void)left;
Modified: cfe/trunk/test/Modules/Inputs/category_other.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/category_other.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/category_other.h (original)
+++ cfe/trunk/test/Modules/Inputs/category_other.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import category_top;
+ at __experimental_modules_import category_top;
@interface Foo(Other)
-(void)other;
Modified: cfe/trunk/test/Modules/Inputs/category_right.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/category_right.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/category_right.h (original)
+++ cfe/trunk/test/Modules/Inputs/category_right.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import category_top;
+ at __experimental_modules_import category_top;
@interface Foo(Right1)
-(void)right1;
Modified: cfe/trunk/test/Modules/Inputs/diamond.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/diamond.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/diamond.h (original)
+++ cfe/trunk/test/Modules/Inputs/diamond.h Thu Mar 1 16:07:04 2012
@@ -1 +1 @@
- at import diamond_bottom;
+ at __experimental_modules_import diamond_bottom;
Modified: cfe/trunk/test/Modules/Inputs/diamond_bottom.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/diamond_bottom.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/diamond_bottom.h (original)
+++ cfe/trunk/test/Modules/Inputs/diamond_bottom.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import diamond_left;
- at import diamond_right;
+ at __experimental_modules_import diamond_left;
+ at __experimental_modules_import diamond_right;
char bottom(char *x);
Modified: cfe/trunk/test/Modules/Inputs/diamond_left.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/diamond_left.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/diamond_left.h (original)
+++ cfe/trunk/test/Modules/Inputs/diamond_left.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import diamond_top;
+ at __experimental_modules_import diamond_top;
float left(float *);
Modified: cfe/trunk/test/Modules/Inputs/diamond_right.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/diamond_right.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/diamond_right.h (original)
+++ cfe/trunk/test/Modules/Inputs/diamond_right.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import diamond_top;
+ at __experimental_modules_import diamond_top;
double right(double *);
Modified: cfe/trunk/test/Modules/Inputs/namespaces-left.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/namespaces-left.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/namespaces-left.h (original)
+++ cfe/trunk/test/Modules/Inputs/namespaces-left.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import namespaces_top;
+ at __experimental_modules_import namespaces_top;
namespace N1 { }
Modified: cfe/trunk/test/Modules/Inputs/namespaces-right.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/namespaces-right.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/namespaces-right.h (original)
+++ cfe/trunk/test/Modules/Inputs/namespaces-right.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import namespaces_top;
+ at __experimental_modules_import namespaces_top;
namespace N2 { }
Modified: cfe/trunk/test/Modules/Inputs/redecl-merge-bottom.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/redecl-merge-bottom.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/redecl-merge-bottom.h (original)
+++ cfe/trunk/test/Modules/Inputs/redecl-merge-bottom.h Thu Mar 1 16:07:04 2012
@@ -1,11 +1,11 @@
- at import redecl_merge_left;
+ at __experimental_modules_import redecl_merge_left;
@class C4;
@class C4;
@protocol P4;
@protocol P4;
@protocol P4;
- at import redecl_merge_right;
+ at __experimental_modules_import redecl_merge_right;
@class B;
Modified: cfe/trunk/test/Modules/Inputs/redecl-merge-left-left.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/redecl-merge-left-left.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/redecl-merge-left-left.h (original)
+++ cfe/trunk/test/Modules/Inputs/redecl-merge-left-left.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import redecl_merge_left;
+ at __experimental_modules_import redecl_merge_left;
@class C4;
void accept_a_C4(C4*);
Modified: cfe/trunk/test/Modules/Inputs/redecl-merge-left.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/redecl-merge-left.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/redecl-merge-left.h (original)
+++ cfe/trunk/test/Modules/Inputs/redecl-merge-left.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import redecl_merge_top;
+ at __experimental_modules_import redecl_merge_top;
@class A;
Modified: cfe/trunk/test/Modules/Inputs/redecl-merge-right.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/redecl-merge-right.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/redecl-merge-right.h (original)
+++ cfe/trunk/test/Modules/Inputs/redecl-merge-right.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import redecl_merge_top;
+ at __experimental_modules_import redecl_merge_top;
@interface Super
@end
@@ -86,7 +86,7 @@
#endif
int ONE;
- at import redecl_merge_top.Explicit;
+ at __experimental_modules_import redecl_merge_top.Explicit;
const int one = ONE;
@interface ClassWithDef
Modified: cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_one.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_one.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_one.h (original)
+++ cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_one.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import A.One;
- at import B.One;
+ at __experimental_modules_import A.One;
+ at __experimental_modules_import B.One;
long *C1;
Modified: cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_two.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_two.h?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_two.h (original)
+++ cfe/trunk/test/Modules/Inputs/wildcard-submodule-exports/C_two.h Thu Mar 1 16:07:04 2012
@@ -1,4 +1,4 @@
- at import A.Two;
- at import B.Two;
+ at __experimental_modules_import A.Two;
+ at __experimental_modules_import B.Two;
unsigned long *C2;
Modified: cfe/trunk/test/Modules/compiler_builtins.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/compiler_builtins.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/compiler_builtins.m (original)
+++ cfe/trunk/test/Modules/compiler_builtins.m Thu Mar 1 16:07:04 2012
@@ -2,9 +2,9 @@
// RUN: %clang -fsyntax-only -fmodules -fmodule-cache-path %t -D__need_wint_t %s -Xclang -verify
#ifdef __SSE__
- at import _Builtin_intrinsics.intel.sse;
+ at __experimental_modules_import _Builtin_intrinsics.intel.sse;
#endif
#ifdef __AVX2__
- at import _Builtin_intrinsics.intel.avx2;
+ at __experimental_modules_import _Builtin_intrinsics.intel.avx2;
#endif
Modified: cfe/trunk/test/Modules/cstd.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/cstd.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/cstd.m (original)
+++ cfe/trunk/test/Modules/cstd.m Thu Mar 1 16:07:04 2012
@@ -2,24 +2,24 @@
// RUN: %clang -fsyntax-only -isystem %S/Inputs/System/usr/include -fmodules -fmodule-cache-path %t -D__need_wint_t -Werror=implicit-function-declaration %s
// Supplied by compiler, but referenced from the "/usr/include" module map.
- at import cstd.float_constants;
+ at __experimental_modules_import cstd.float_constants;
float getFltMax() { return FLT_MAX; }
// Supplied by the "/usr/include" module map.
- at import cstd.stdio;
+ at __experimental_modules_import cstd.stdio;
void test_fprintf(FILE *file) {
fprintf(file, "Hello, modules\n");
}
// Supplied by compiler, which forwards to the the "/usr/include" version.
- at import cstd.stdint;
+ at __experimental_modules_import cstd.stdint;
my_awesome_nonstandard_integer_type value;
// Supplied by the compiler; that version wins.
- at import cstd.stdbool;
+ at __experimental_modules_import cstd.stdbool;
#ifndef bool
# error "bool was not defined!"
Modified: cfe/trunk/test/Modules/cycles.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/cycles.c?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/cycles.c (original)
+++ cfe/trunk/test/Modules/cycles.c Thu Mar 1 16:07:04 2012
@@ -1,12 +1,12 @@
// RUN: rm -rf %t
// RUN: %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -F %S/Inputs %s 2>&1 | FileCheck %s
// FIXME: When we have a syntax for modules in C, use that.
- at import MutuallyRecursive1;
+ at __experimental_modules_import MutuallyRecursive1;
// FIXME: Lots of redundant diagnostics here, because the preprocessor
// can't currently tell the parser not to try to load the module again.
-// CHECK: MutuallyRecursive2.h:3:9: fatal error: cyclic dependency in module 'MutuallyRecursive1': MutuallyRecursive1 -> MutuallyRecursive2 -> MutuallyRecursive1
-// CHECK: MutuallyRecursive1.h:2:9: fatal error: could not build module 'MutuallyRecursive2'
-// CHECK: cycles.c:4:9: fatal error: could not build module 'MutuallyRecursive1'
+// CHECK: MutuallyRecursive2.h:3:32: fatal error: cyclic dependency in module 'MutuallyRecursive1': MutuallyRecursive1 -> MutuallyRecursive2 -> MutuallyRecursive1
+// CHECK: MutuallyRecursive1.h:2:32: fatal error: could not build module 'MutuallyRecursive2'
+// CHECK: cycles.c:4:32: fatal error: could not build module 'MutuallyRecursive1'
Modified: cfe/trunk/test/Modules/decldef.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/decldef.mm?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/decldef.mm (original)
+++ cfe/trunk/test/Modules/decldef.mm Thu Mar 1 16:07:04 2012
@@ -10,10 +10,10 @@
// in other file: expected-note{{previous definition is here}}
- at import decldef;
+ at __experimental_modules_import decldef;
A *a1; // expected-error{{unknown type name 'A'}}
B *b1; // expected-error{{unknown type name 'B'}}
- at import decldef.Decl;
+ at __experimental_modules_import decldef.Decl;
A *a2;
B *b;
Modified: cfe/trunk/test/Modules/diamond.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/diamond.c?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/diamond.c (original)
+++ cfe/trunk/test/Modules/diamond.c Thu Mar 1 16:07:04 2012
@@ -3,7 +3,7 @@
// in diamond-bottom.h: expected-note{{passing argument to parameter 'x' here}}
- at import diamond_bottom;
+ at __experimental_modules_import diamond_bottom;
void test_diamond(int i, float f, double d, char c) {
top(&i);
Modified: cfe/trunk/test/Modules/header-import.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/header-import.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/header-import.m (original)
+++ cfe/trunk/test/Modules/header-import.m Thu Mar 1 16:07:04 2012
@@ -2,6 +2,6 @@
// RUN: %clang_cc1 -fmodules -fmodule-cache-path %t -F %S/Inputs -I %S/Inputs -verify %s
#import "point.h"
- at import Module;
+ at __experimental_modules_import Module;
#import "point.h"
Modified: cfe/trunk/test/Modules/inferred-submodules.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/inferred-submodules.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/inferred-submodules.m (original)
+++ cfe/trunk/test/Modules/inferred-submodules.m Thu Mar 1 16:07:04 2012
@@ -1,13 +1,13 @@
// RUN: rm -rf %t
// RUN: %clang_cc1 -x objective-c -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs %s -verify
- at import Module.Sub;
+ at __experimental_modules_import Module.Sub;
void test_Module_Sub() {
int *ip = Module_Sub;
}
- at import Module.Buried.Treasure;
+ at __experimental_modules_import Module.Buried.Treasure;
void dig() {
unsigned *up = Buried_Treasure;
Modified: cfe/trunk/test/Modules/irgen.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/irgen.c?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/irgen.c (original)
+++ cfe/trunk/test/Modules/irgen.c Thu Mar 1 16:07:04 2012
@@ -3,7 +3,7 @@
// RUN: %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s
// FIXME: When we have a syntax for modules in C, use that.
- at import irgen;
+ at __experimental_modules_import irgen;
// CHECK: define void @triple_value
void triple_value(int *px) {
Modified: cfe/trunk/test/Modules/load_failure.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/load_failure.c?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/load_failure.c (original)
+++ cfe/trunk/test/Modules/load_failure.c Thu Mar 1 16:07:04 2012
@@ -1,15 +1,15 @@
#ifdef NONEXISTENT
- at import load_nonexistent;
+ at __experimental_modules_import load_nonexistent;
#endif
#ifdef FAILURE
- at import load_failure;
+ at __experimental_modules_import load_failure;
#endif
// RUN: rm -rf %t
// RUN: %clang_cc1 -fmodules -x objective-c++ -fmodule-cache-path %t -fdisable-module-hash -emit-module -fmodule-name=load_failure %S/Inputs/module.map
// RUN: %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -fdisable-module-hash %s -DNONEXISTENT 2>&1 | FileCheck -check-prefix=CHECK-NONEXISTENT %s
-// CHECK-NONEXISTENT: load_failure.c:2:9: fatal error: module 'load_nonexistent' not found
+// CHECK-NONEXISTENT: load_failure.c:2:32: fatal error: module 'load_nonexistent' not found
// RUN: not %clang_cc1 -fmodules -x objective-c -fmodule-cache-path %t -fdisable-module-hash %s -DFAILURE 2> %t.out
// RUN: FileCheck -check-prefix=CHECK-FAILURE %s < %t.out
Modified: cfe/trunk/test/Modules/lookup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/lookup.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/lookup.cpp (original)
+++ cfe/trunk/test/Modules/lookup.cpp Thu Mar 1 16:07:04 2012
@@ -1,8 +1,8 @@
-#define import @import
+#define import @__experimental_modules_import
import lookup_left_cxx;
#undef import
-#define IMPORT(X) @import X
+#define IMPORT(X) @__experimental_modules_import X
IMPORT(lookup_right_cxx);
void test(int i, float f) {
Modified: cfe/trunk/test/Modules/lookup.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/lookup.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/lookup.m (original)
+++ cfe/trunk/test/Modules/lookup.m Thu Mar 1 16:07:04 2012
@@ -1,8 +1,8 @@
// lookup_left.h: expected-note{{using}}
// lookup_right.h: expected-note{{also found}}
- at import lookup_left_objc;
- at import lookup_right_objc;
+ at __experimental_modules_import lookup_left_objc;
+ at __experimental_modules_import lookup_right_objc;
void test(id x) {
[x method]; // expected-warning{{multiple methods named 'method' found}}
Modified: cfe/trunk/test/Modules/macros.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/macros.c?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/macros.c (original)
+++ cfe/trunk/test/Modules/macros.c Thu Mar 1 16:07:04 2012
@@ -4,7 +4,7 @@
// RUN: %clang_cc1 -E -fmodules -x objective-c -fmodule-cache-path %t %s | FileCheck -check-prefix CHECK-PREPROCESSED %s
// FIXME: When we have a syntax for modules in C, use that.
- at import macros;
+ at __experimental_modules_import macros;
#ifndef INTEGER
# error INTEGER macro should be visible
Modified: cfe/trunk/test/Modules/method_pool.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/method_pool.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/method_pool.m (original)
+++ cfe/trunk/test/Modules/method_pool.m Thu Mar 1 16:07:04 2012
@@ -1,7 +1,7 @@
// RUN: rm -rf %t
// RUN: %clang_cc1 -fmodule-cache-path %t -fmodules -I %S/Inputs %s -verify
- at import MethodPoolA;
+ at __experimental_modules_import MethodPoolA;
// in other file: // expected-note{{using}}
@@ -19,7 +19,7 @@
[object method2:1];
}
- at import MethodPoolB;
+ at __experimental_modules_import MethodPoolB;
void testMethod1Again(id object) {
[object method1];
Modified: cfe/trunk/test/Modules/module-private.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/module-private.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/module-private.cpp (original)
+++ cfe/trunk/test/Modules/module-private.cpp Thu Mar 1 16:07:04 2012
@@ -4,8 +4,8 @@
// RUN: %clang_cc1 -fmodules -x objective-c++ -fmodule-cache-path %t %s -verify
// FIXME: When we have a syntax for modules in C++, use that.
- at import module_private_left;
- at import module_private_right;
+ at __experimental_modules_import module_private_left;
+ at __experimental_modules_import module_private_right;
void test() {
int &ir = f0(1.0); // okay: f0() from 'right' is not visible
Modified: cfe/trunk/test/Modules/namespaces.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/namespaces.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/namespaces.cpp (original)
+++ cfe/trunk/test/Modules/namespaces.cpp Thu Mar 1 16:07:04 2012
@@ -7,8 +7,8 @@
namespace N8 { }
- at import namespaces_left;
- at import namespaces_right;
+ at __experimental_modules_import namespaces_left;
+ at __experimental_modules_import namespaces_right;
void test() {
int &ir1 = N1::f(1);
Modified: cfe/trunk/test/Modules/normal-module-map.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/normal-module-map.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/normal-module-map.cpp (original)
+++ cfe/trunk/test/Modules/normal-module-map.cpp Thu Mar 1 16:07:04 2012
@@ -8,7 +8,7 @@
return umbrella + umbrella_sub;
}
- at import Umbrella2;
+ at __experimental_modules_import Umbrella2;
#include "a1.h"
#include "b1.h"
@@ -18,7 +18,7 @@
return a1 + b1 + nested2;
}
- at import nested_umbrella.a;
+ at __experimental_modules_import nested_umbrella.a;
int testNestedUmbrellaA() {
return nested_umbrella_a;
@@ -28,7 +28,7 @@
return nested_umbrella_b; // expected-error{{use of undeclared identifier 'nested_umbrella_b'; did you mean 'nested_umbrella_a'?}}
}
- at import nested_umbrella.b;
+ at __experimental_modules_import nested_umbrella.b;
int testNestedUmbrellaB() {
return nested_umbrella_b;
Modified: cfe/trunk/test/Modules/objc-categories.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/objc-categories.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/objc-categories.m (original)
+++ cfe/trunk/test/Modules/objc-categories.m Thu Mar 1 16:07:04 2012
@@ -6,7 +6,7 @@
// RUN: %clang_cc1 -fmodules -fmodule-cache-path %t -x objective-c -fmodule-name=category_other -emit-module %S/Inputs/module.map
// RUN: %clang_cc1 -fmodules -fmodule-cache-path %t %s -verify
- at import category_bottom;
+ at __experimental_modules_import category_bottom;
@@ -33,7 +33,7 @@
// Load another module that also adds categories to Foo, verify that
// we see those categories.
- at import category_other;
+ at __experimental_modules_import category_other;
void test_other(Foo *foo) {
[foo other];
Modified: cfe/trunk/test/Modules/on-demand-build-warnings.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/on-demand-build-warnings.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/on-demand-build-warnings.m (original)
+++ cfe/trunk/test/Modules/on-demand-build-warnings.m Thu Mar 1 16:07:04 2012
@@ -1,5 +1,5 @@
// RUN: rm -rf %t
// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Wmodule-build -fmodule-cache-path %t -F %S/Inputs -verify %s
- at import Module; // expected-warning{{building module 'Module' from source}}
+ at __experimental_modules_import Module; // expected-warning{{building module 'Module' from source}}
Modified: cfe/trunk/test/Modules/on-demand-build.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/on-demand-build.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/on-demand-build.m (original)
+++ cfe/trunk/test/Modules/on-demand-build.m Thu Mar 1 16:07:04 2012
@@ -3,7 +3,7 @@
// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -x objective-c++ -fmodule-cache-path %t -F %S/Inputs -I %S/Inputs -verify %s
// RUN: %clang_cc1 -fmodules -fno-objc-infer-related-result-type -Werror -Wno-error=incomplete-umbrella -fmodule-cache-path %t -F %S/Inputs -I %S/Inputs -verify %s
#define FOO
- at import Module;
+ at __experimental_modules_import Module;
@interface OtherClass
@end
@@ -22,6 +22,6 @@
# error MODULE_SUBFRAMEWORK_H should be hidden
#endif
- at import subdir;
+ at __experimental_modules_import subdir;
const char *getSubdirTest() { return getSubdir(); }
Modified: cfe/trunk/test/Modules/on-demand-macros.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/on-demand-macros.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/on-demand-macros.m (original)
+++ cfe/trunk/test/Modules/on-demand-macros.m Thu Mar 1 16:07:04 2012
@@ -2,7 +2,7 @@
// RUN: %clang_cc1 -fmodules -fmodule-cache-path %t -F %S/Inputs -DFOO_RETURNS_INT_PTR -verify %s
// RUN: %clang_cc1 -fmodules -fmodule-cache-path %t -F %S/Inputs -verify %s
- at import CmdLine;
+ at __experimental_modules_import CmdLine;
void test() {
#ifdef FOO_RETURNS_INT_PTR
Modified: cfe/trunk/test/Modules/redecl-merge.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/redecl-merge.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/redecl-merge.m (original)
+++ cfe/trunk/test/Modules/redecl-merge.m Thu Mar 1 16:07:04 2012
@@ -4,12 +4,12 @@
@class C2;
@class C3;
@class C3;
- at import redecl_merge_left;
+ at __experimental_modules_import redecl_merge_left;
typedef struct my_struct_type *my_struct_ref;
@protocol P4;
@class C3;
@class C3;
- at import redecl_merge_right;
+ at __experimental_modules_import redecl_merge_right;
@implementation A
- (Super*)init { return self; }
@@ -113,7 +113,7 @@
ClassWithDef *cwd1;
- at import redecl_merge_left_left;
+ at __experimental_modules_import redecl_merge_left_left;
void test_C4a(C4 *c4) {
global_C4 = c4 = get_a_C4();
@@ -124,7 +124,7 @@
[cwd method];
}
- at import redecl_merge_bottom;
+ at __experimental_modules_import redecl_merge_bottom;
void test_C4b() {
if (&refers_to_C4) {
Modified: cfe/trunk/test/Modules/redeclarations.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/redeclarations.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/redeclarations.m (original)
+++ cfe/trunk/test/Modules/redeclarations.m Thu Mar 1 16:07:04 2012
@@ -1,5 +1,5 @@
- at import redeclarations_left;
- at import redeclarations_right;
+ at __experimental_modules_import redeclarations_left;
+ at __experimental_modules_import redeclarations_right;
@interface MyObject : NSObject
@end
Modified: cfe/trunk/test/Modules/requires.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/requires.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/requires.m (original)
+++ cfe/trunk/test/Modules/requires.m Thu Mar 1 16:07:04 2012
@@ -1,5 +1,5 @@
// RUN: rm -rf %t
// RUN: %clang_cc1 -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs %s -verify
- at import DependsOnModule.CXX; // expected-error{{module 'DependsOnModule.CXX' requires feature 'cplusplus'}}
+ at __experimental_modules_import DependsOnModule.CXX; // expected-error{{module 'DependsOnModule.CXX' requires feature 'cplusplus'}}
Modified: cfe/trunk/test/Modules/subframeworks.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/subframeworks.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/subframeworks.m (original)
+++ cfe/trunk/test/Modules/subframeworks.m Thu Mar 1 16:07:04 2012
@@ -2,13 +2,13 @@
// RUN: %clang_cc1 -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs -F %S/Inputs/DependsOnModule.framework/Frameworks %s -verify
// RUN: %clang_cc1 -x objective-c++ -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs -F %S/Inputs/DependsOnModule.framework/Frameworks %s -verify
- at import DependsOnModule;
+ at __experimental_modules_import DependsOnModule;
void testSubFramework() {
float *sf1 = sub_framework; // expected-error{{use of undeclared identifier 'sub_framework'}}
}
- at import DependsOnModule.SubFramework;
+ at __experimental_modules_import DependsOnModule.SubFramework;
void testSubFrameworkAgain() {
float *sf2 = sub_framework;
@@ -16,7 +16,7 @@
}
#ifdef __cplusplus
- at import DependsOnModule.CXX;
+ at __experimental_modules_import DependsOnModule.CXX;
CXXOnly cxxonly;
#endif
Modified: cfe/trunk/test/Modules/submodules-preprocess.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/submodules-preprocess.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/submodules-preprocess.cpp (original)
+++ cfe/trunk/test/Modules/submodules-preprocess.cpp Thu Mar 1 16:07:04 2012
@@ -2,7 +2,7 @@
// RUN: %clang_cc1 -fmodules -x objective-c++ -Eonly -fmodule-cache-path %t -I %S/Inputs/submodules %s -verify
// FIXME: When we have a syntax for modules in C++, use that.
- at import std.vector;
+ at __experimental_modules_import std.vector;
#ifndef HAVE_VECTOR
# error HAVE_VECTOR macro is not available (but should be)
@@ -16,7 +16,7 @@
# error HAVE_HASH_MAP macro is available (but shouldn't be)
#endif
- at import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
+ at __experimental_modules_import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
#ifndef HAVE_VECTOR
# error HAVE_VECTOR macro is not available (but should be)
@@ -30,9 +30,9 @@
# error HAVE_HASH_MAP macro is available (but shouldn't be)
#endif
- at import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
+ at __experimental_modules_import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
- at import std; // import everything in 'std'
+ at __experimental_modules_import std; // import everything in 'std'
#ifndef HAVE_VECTOR
# error HAVE_VECTOR macro is not available (but should be)
@@ -46,7 +46,7 @@
# error HAVE_HASH_MAP macro is available (but shouldn't be)
#endif
- at import std.hash_map;
+ at __experimental_modules_import std.hash_map;
#ifndef HAVE_VECTOR
# error HAVE_VECTOR macro is not available (but should be)
Modified: cfe/trunk/test/Modules/submodules.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/submodules.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/submodules.cpp (original)
+++ cfe/trunk/test/Modules/submodules.cpp Thu Mar 1 16:07:04 2012
@@ -2,7 +2,7 @@
// RUN: %clang_cc1 -x objective-c++ -fmodule-cache-path %t -fmodules -I %S/Inputs/submodules %s -verify
// FIXME: When we have a syntax for modules in C++, use that.
- at import std.vector;
+ at __experimental_modules_import std.vector;
vector<int> vi;
@@ -10,20 +10,20 @@
remove_reference<int&>::type *int_ptr = 0; // expected-error{{unknown type name 'remove_reference'}} \
// expected-error{{expected unqualified-id}}
- at import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
+ at __experimental_modules_import std.typetraits; // expected-error{{no submodule named 'typetraits' in module 'std'; did you mean 'type_traits'?}}
vector<float> vf;
remove_reference<int&>::type *int_ptr2 = 0;
- at import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
+ at __experimental_modules_import std.vector.compare; // expected-error{{no submodule named 'compare' in module 'std.vector'}}
- at import std; // import everything in 'std'
+ at __experimental_modules_import std; // import everything in 'std'
// hash_map still isn't available.
hash_map<int, float> ints_to_floats; // expected-error{{unknown type name 'hash_map'}} \
// expected-error{{expected unqualified-id}}
- at import std.hash_map;
+ at __experimental_modules_import std.hash_map;
hash_map<int, float> ints_to_floats2;
Modified: cfe/trunk/test/Modules/submodules.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/submodules.m?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/submodules.m (original)
+++ cfe/trunk/test/Modules/submodules.m Thu Mar 1 16:07:04 2012
@@ -3,7 +3,7 @@
// RUN: %clang_cc1 -Wauto-import -fmodule-cache-path %t -fmodules -F %S/Inputs %s -verify
// Note: transitively imports Module.Sub2.
- at import Module.Sub;
+ at __experimental_modules_import Module.Sub;
int getValue() {
return *Module_Sub + *Module_Sub2;
Modified: cfe/trunk/test/Modules/wildcard-submodule-exports.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/wildcard-submodule-exports.cpp?rev=151841&r1=151840&r2=151841&view=diff
==============================================================================
--- cfe/trunk/test/Modules/wildcard-submodule-exports.cpp (original)
+++ cfe/trunk/test/Modules/wildcard-submodule-exports.cpp Thu Mar 1 16:07:04 2012
@@ -2,7 +2,7 @@
// RUN: %clang_cc1 -x objective-c++ -fmodule-cache-path %t -fmodules -I %S/Inputs/wildcard-submodule-exports %s -verify
// FIXME: When we have a syntax for modules in C++, use that.
- at import C.One;
+ at __experimental_modules_import C.One;
void test_C_One() {
int *A1_ptr = A1;
@@ -10,7 +10,7 @@
(void)B1; // expected-error{{use of undeclared identifier 'B1'}}
}
- at import C.Two;
+ at __experimental_modules_import C.Two;
void test_C_Two() {
unsigned int *A2_ptr = A2;
@@ -18,7 +18,7 @@
unsigned long *C2_ptr = C2;
}
- at import B.One;
+ at __experimental_modules_import B.One;
void test_B_One() {
short *B1_ptr = B1;
More information about the cfe-commits
mailing list