[cfe-commits] r98993 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td test/SemaObjC/ivar-in-class-extension.m

[Fariborz Jahanian]

Author: fjahanian
Date: Fri Mar 19 16:25:51 2010
New Revision: 98993

URL: http://llvm.org/viewvc/llvm-project?rev=98993&view=rev
Log:
More coherent diagnostics when ivar is placed n categories.
(related to radar 7538989).

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/test/SemaObjC/ivar-in-class-extension.m

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=98993&r1=98992&r2=98993&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Fri Mar 19 16:25:51 2010
@@ -1537,8 +1537,7 @@
   "ISO C++ forbids forward references to 'enum' types">;
 def err_redefinition_of_enumerator : Error<"redefinition of enumerator %0">;
 def err_duplicate_member : Error<"duplicate member %0">;
-def err_misplaced_ivar : Error<"ivar may be placed in a class extension "
-                               "in non-fragile-abi2 mode only">;
+def err_misplaced_ivar : Error<"ivars may not be placed in categories">;
 def ext_enum_value_not_int : Extension<
   "ISO C restricts enumerator values to range of 'int' (%0 is too "
   "%select{small|large}1)">;

Modified: cfe/trunk/test/SemaObjC/ivar-in-class-extension.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/ivar-in-class-extension.m?rev=98993&r1=98992&r2=98993&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/ivar-in-class-extension.m (original)
+++ cfe/trunk/test/SemaObjC/ivar-in-class-extension.m Fri Mar 19 16:25:51 2010
@@ -31,12 +31,12 @@
 @end
 
 @interface SomeClass (Category)
-    {	// expected-error {{ivar may be placed in a class extension}}
+    {	// expected-error {{ivars may not be placed in categories}}
         int categoryIvar;
     }
 @end
 
 @interface SomeClass (Category1)
-    {	// expected-error {{ivar may be placed in a class extension}}
+    {	// expected-error {{ivars may not be placed in categories}}
     }
 @end