[cfe-commits] r164566 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td test/SemaObjC/arc-property-decl-attrs.m test/SemaObjC/arc-property-lifetime.m test/SemaObjC/arc-property.m test/SemaObjC/ivar-in-class-extension-error.m test/SemaObjC/ivar-in-class-extension.m
Fariborz Jahanian
fjahanian at apple.com
Mon Sep 24 15:51:51 PDT 2012
Author: fjahanian
Date: Mon Sep 24 17:51:51 2012
New Revision: 164566
URL: http://llvm.org/viewvc/llvm-project?rev=164566&view=rev
Log:
objective-C: use 'instance variables' as plural when referring
to the feature.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/SemaObjC/arc-property-decl-attrs.m
cfe/trunk/test/SemaObjC/arc-property-lifetime.m
cfe/trunk/test/SemaObjC/arc-property.m
cfe/trunk/test/SemaObjC/ivar-in-class-extension-error.m
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=164566&r1=164565&r2=164566&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Mon Sep 24 17:51:51 2012
@@ -3235,7 +3235,7 @@
def err_redefinition_of_enumerator : Error<"redefinition of enumerator %0">;
def err_duplicate_member : Error<"duplicate member %0">;
def err_misplaced_ivar : Error<
- "instance variable may not be placed in %select{categories|class extension}0">;
+ "instance variables may not be placed in %select{categories|class extension}0">;
def warn_ivars_in_interface : Warning<
"declaration of instance variables in the interface is deprecated">,
InGroup<DiagGroup<"objc-interface-ivars">>, DefaultIgnore;
@@ -3614,7 +3614,7 @@
def err_arc_new_array_without_ownership : Error<
"'new' cannot allocate an array of %0 with no explicit ownership">;
def err_arc_autoreleasing_var : Error<
- "%select{__block variables|global variables|fields|instance variable}0 cannot have "
+ "%select{__block variables|global variables|fields|instance variables}0 cannot have "
"__autoreleasing ownership">;
def err_arc_autoreleasing_capture : Error<
"cannot capture __autoreleasing variable in a "
Modified: cfe/trunk/test/SemaObjC/arc-property-decl-attrs.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-property-decl-attrs.m?rev=164566&r1=164565&r2=164566&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/arc-property-decl-attrs.m (original)
+++ cfe/trunk/test/SemaObjC/arc-property-decl-attrs.m Mon Sep 24 17:51:51 2012
@@ -5,7 +5,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variables cannot have __autoreleasing ownership}}
}
@property(strong) id x;
@property(strong) id y;
@@ -16,7 +16,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variables cannot have __autoreleasing ownership}}
}
@property(retain) id x;
@property(retain) id y;
@@ -27,7 +27,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variables cannot have __autoreleasing ownership}}
}
@property(copy) id x;
@property(copy) id y;
Modified: cfe/trunk/test/SemaObjC/arc-property-lifetime.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-property-lifetime.m?rev=164566&r1=164565&r2=164566&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/arc-property-lifetime.m (original)
+++ cfe/trunk/test/SemaObjC/arc-property-lifetime.m Mon Sep 24 17:51:51 2012
@@ -5,7 +5,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variables cannot have __autoreleasing ownership}}
}
@property(strong) id x; // expected-note {{property declared here}}
@property(strong) id y; // expected-note {{property declared here}}
@@ -22,7 +22,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variables cannot have __autoreleasing ownership}}
}
@property(retain) id x; // expected-note {{property declared here}}
@property(retain) id y; // expected-note {{property declared here}}
@@ -39,7 +39,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variables cannot have __autoreleasing ownership}}
}
@property(copy) id x; // expected-note {{property declared here}}
@property(copy) id y; // expected-note {{property declared here}}
Modified: cfe/trunk/test/SemaObjC/arc-property.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-property.m?rev=164566&r1=164565&r2=164566&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/arc-property.m (original)
+++ cfe/trunk/test/SemaObjC/arc-property.m Mon Sep 24 17:51:51 2012
@@ -33,7 +33,7 @@
@public
id __unsafe_unretained x; // should be __weak
id __strong y;
- id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variables cannot have __autoreleasing ownership}}
}
@property(weak) id x; // expected-note {{property declared here}}
@property(weak) id y; // expected-note {{property declared here}}
Modified: cfe/trunk/test/SemaObjC/ivar-in-class-extension-error.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/ivar-in-class-extension-error.m?rev=164566&r1=164565&r2=164566&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/ivar-in-class-extension-error.m (original)
+++ cfe/trunk/test/SemaObjC/ivar-in-class-extension-error.m Mon Sep 24 17:51:51 2012
@@ -4,12 +4,12 @@
@interface A @end
@interface A () {
- int _p0; // expected-error {{instance variable may not be placed in class extension}}
+ int _p0; // expected-error {{instance variables may not be placed in class extension}}
}
@property int p0;
@end
@interface A(CAT) {
- int _p1; // expected-error {{instance variable may not be placed in categories}}
+ int _p1; // expected-error {{instance variables may not be placed in categories}}
}
@end
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=164566&r1=164565&r2=164566&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/ivar-in-class-extension.m (original)
+++ cfe/trunk/test/SemaObjC/ivar-in-class-extension.m Mon Sep 24 17:51:51 2012
@@ -32,7 +32,7 @@
@interface SomeClass (Category)
{
- int categoryIvar; // expected-error {{instance variable may not be placed in categories}}
+ int categoryIvar; // expected-error {{instance variables may not be placed in categories}}
}
@end
More information about the cfe-commits
mailing list