Introduce a non-uglified syntax for module imports in Objective-C:
@import identifier [. identifier]* ;
llvm-svn: 147452
diff --git a/clang/test/Modules/Inputs/category_bottom.h b/clang/test/Modules/Inputs/category_bottom.h
index 20f7813..ab4c01c 100644
--- a/clang/test/Modules/Inputs/category_bottom.h
+++ b/clang/test/Modules/Inputs/category_bottom.h
@@ -1,10 +1,10 @@
-__import_module__ category_left;
+@import category_left;
@interface Foo(Bottom)
-(void)bottom;
@end
-__import_module__ category_right;
+@import category_right;
@interface LeftFoo(Bottom)
-(void)bottom;
diff --git a/clang/test/Modules/Inputs/category_left.h b/clang/test/Modules/Inputs/category_left.h
index d388a03..05e2a1b 100644
--- a/clang/test/Modules/Inputs/category_left.h
+++ b/clang/test/Modules/Inputs/category_left.h
@@ -1,4 +1,4 @@
-__import_module__ category_top;
+@import category_top;
@interface Foo(Left)
-(void)left;
diff --git a/clang/test/Modules/Inputs/category_right.h b/clang/test/Modules/Inputs/category_right.h
index a1a1377..48d4f6c 100644
--- a/clang/test/Modules/Inputs/category_right.h
+++ b/clang/test/Modules/Inputs/category_right.h
@@ -1,4 +1,4 @@
-__import_module__ category_top;
+@import category_top;
@interface Foo(Right1)
-(void)right1;
diff --git a/clang/test/Modules/Inputs/redecl-merge-bottom.h b/clang/test/Modules/Inputs/redecl-merge-bottom.h
index 26a1ba5..a054cd2 100644
--- a/clang/test/Modules/Inputs/redecl-merge-bottom.h
+++ b/clang/test/Modules/Inputs/redecl-merge-bottom.h
@@ -1,11 +1,11 @@
-__import_module__ redecl_merge_left;
+@import redecl_merge_left;
@class C4;
@class C4;
@protocol P4;
@protocol P4;
@protocol P4;
-__import_module__ redecl_merge_right;
+@import redecl_merge_right;
@class B;
diff --git a/clang/test/Modules/Inputs/redecl-merge-left-left.h b/clang/test/Modules/Inputs/redecl-merge-left-left.h
index 0d7fd6a..6126081 100644
--- a/clang/test/Modules/Inputs/redecl-merge-left-left.h
+++ b/clang/test/Modules/Inputs/redecl-merge-left-left.h
@@ -1,4 +1,4 @@
-__import_module__ redecl_merge_left;
+@import redecl_merge_left;
@class C4;
void accept_a_C4(C4*);
diff --git a/clang/test/Modules/Inputs/redecl-merge-left.h b/clang/test/Modules/Inputs/redecl-merge-left.h
index 4ea1e70e..82146f7 100644
--- a/clang/test/Modules/Inputs/redecl-merge-left.h
+++ b/clang/test/Modules/Inputs/redecl-merge-left.h
@@ -1,4 +1,4 @@
-__import_module__ redecl_merge_top;
+@import redecl_merge_top;
@class A;
diff --git a/clang/test/Modules/Inputs/redecl-merge-right.h b/clang/test/Modules/Inputs/redecl-merge-right.h
index 82051d4..b6dfe2f 100644
--- a/clang/test/Modules/Inputs/redecl-merge-right.h
+++ b/clang/test/Modules/Inputs/redecl-merge-right.h
@@ -1,4 +1,4 @@
-__import_module__ redecl_merge_top;
+@import redecl_merge_top;
@interface Super
@end
@@ -55,5 +55,5 @@
#endif
int ONE;
-__import_module__ redecl_merge_top.Explicit;
+@import redecl_merge_top.Explicit;
const int one = ONE;