Author: fjahanian
Date: Fri May 18 16:22:49 2012
New Revision: 157074
URL: http://llvm.org/viewvc/llvm-project?rev=157074&view=rev
Log:
objc: use "class extension" instead of "continuation class"
to match documentation. // rdar://11309706
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/SemaObjC/continuation-class-err.m
cfe/trunk/test/SemaObjC/continuation-class-property.m
cfe/trunk/test/SemaObjC/duplicate-property-class-extension.m
cfe/trunk/test/SemaObjC/narrow-property-type-in-cont-class.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=157074&r1=157073&r2=157074&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Fri May 18 16:22:49
2012
@@ -593,7 +593,7 @@
"default property attribute 'assign' not appropriate for non-GC object">,
InGroup<ObjCPropertyNoAttribute>;
def warn_property_attr_mismatch : Warning<
- "property attribute in continuation class does not match the primary class">;
+ "property attribute in class extension does not match the primary class">;
def warn_objc_property_copy_missing_on_block : Warning<
"'copy' attribute must be specified for the block property "
"when -fobjc-gc-only is specified">;
@@ -634,16 +634,16 @@
"(property should be marked 'atomic' if this is intended)">,
InGroup<CustomAtomic>, DefaultIgnore;
def err_use_continuation_class : Error<
- "illegal redeclaration of property in continuation class %0"
+ "illegal redeclaration of property in class extension %0"
" (attribute must be 'readwrite', while its primary must be 'readonly')">;
def err_type_mismatch_continuation_class : Error<
- "type of property %0 in continuation class does not match "
+ "type of property %0 in class extension does not match "
"property type in primary class">;
def err_use_continuation_class_redeclaration_readwrite : Error<
- "illegal redeclaration of 'readwrite' property in continuation class %0"
+ "illegal redeclaration of 'readwrite' property in class extension %0"
" (perhaps you intended this to be a 'readwrite' redeclaration of a "
"'readonly' public property?)">;
-def err_continuation_class : Error<"continuation class has no primary class">;
+def err_continuation_class : Error<"class extension has no primary class">;
def err_property_type : Error<"property cannot have array or function type
%0">;
def error_missing_property_context : Error<
"missing context for property implementation declaration">;
Modified: cfe/trunk/test/SemaObjC/continuation-class-err.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/continuation-class-err.m?rev=157074&r1=157073&r2=157074&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/continuation-class-err.m (original)
+++ cfe/trunk/test/SemaObjC/continuation-class-err.m Fri May 18 16:22:49 2012
@@ -11,8 +11,8 @@
@end
@interface ReadOnly ()
-@property(readwrite, copy) id object; // expected-warning {{property
attribute in continuation class does not match the primary class}}
-@property(readonly) id object1; // expected-error {{illegal redeclaration of
property in continuation class 'ReadOnly' (attribute must be 'readwrite', while
its primary must be 'readonly')}}
+@property(readwrite, copy) id object; // expected-warning {{property
attribute in class extension does not match the primary class}}
+@property(readonly) id object1; // expected-error {{illegal redeclaration of
property in class extension 'ReadOnly' (attribute must be 'readwrite', while
its primary must be 'readonly')}}
@property (readwrite, assign) int indentLevel; // OK. assign the the default
in any case.
@end
@@ -31,8 +31,8 @@
@end
@interface Bar ()
-@property (copy) id foo; // expected-error {{illegal redeclaration of property
in continuation class 'Bar' (attribute must be 'readwrite', while its primary
must be 'readonly')}}
-@property (copy) id fee; // expected-error {{illegal redeclaration of property
in continuation class 'Bar' (attribute must be 'readwrite', while its primary
must be 'readonly')}}
+@property (copy) id foo; // expected-error {{illegal redeclaration of property
in class extension 'Bar' (attribute must be 'readwrite', while its primary must
be 'readonly')}}
+@property (copy) id fee; // expected-error {{illegal redeclaration of property
in class extension 'Bar' (attribute must be 'readwrite', while its primary must
be 'readonly')}}
@end
@implementation Bar
Modified: cfe/trunk/test/SemaObjC/continuation-class-property.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/continuation-class-property.m?rev=157074&r1=157073&r2=157074&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/continuation-class-property.m (original)
+++ cfe/trunk/test/SemaObjC/continuation-class-property.m Fri May 18 16:22:49
2012
@@ -38,8 +38,8 @@
@end
@interface MyClass ()
-@property (readwrite) NSString *foo; // expected-error {{type of property
'NSString *' in continuation class does not match property type in primary
class}}
-@property (readwrite, strong) NSRect bar; // expected-error {{type of property
'NSRect' in continuation class does not match property type in primary class}}
+@property (readwrite) NSString *foo; // expected-error {{type of property
'NSString *' in class extension does not match property type in primary class}}
+@property (readwrite, strong) NSRect bar; // expected-error {{type of property
'NSRect' in class extension does not match property type in primary class}}
@end
// rdar://10655530
Modified: cfe/trunk/test/SemaObjC/duplicate-property-class-extension.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/duplicate-property-class-extension.m?rev=157074&r1=157073&r2=157074&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/duplicate-property-class-extension.m (original)
+++ cfe/trunk/test/SemaObjC/duplicate-property-class-extension.m Fri May 18
16:22:49 2012
@@ -9,7 +9,7 @@
@interface Foo ()
@property (readwrite) char foo; // expected-note 2 {{property declared here}}
@property (readwrite) char NewProperty; // expected-note 2 {{property declared
here}}
-@property (readwrite) char bar; // expected-error{{illegal redeclaration of
'readwrite' property in continuation class 'Foo' (perhaps you intended this to
be a 'readwrite' redeclaration of a 'readonly' public property?)}}
+@property (readwrite) char bar; // expected-error{{illegal redeclaration of
'readwrite' property in class extension 'Foo' (perhaps you intended this to be
a 'readwrite' redeclaration of a 'readonly' public property?)}}
@end
@interface Foo ()
Modified: cfe/trunk/test/SemaObjC/narrow-property-type-in-cont-class.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/narrow-property-type-in-cont-class.m?rev=157074&r1=157073&r2=157074&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/narrow-property-type-in-cont-class.m (original)
+++ cfe/trunk/test/SemaObjC/narrow-property-type-in-cont-class.m Fri May 18
16:22:49 2012
@@ -14,6 +14,6 @@
@interface GKTurnBasedMatchMakerKVO ()
@property(nonatomic,readwrite,retain) NSMutableArray* outline;
-@property(nonatomic,readwrite,retain) NSArray* err_outline; // expected-error
{{type of property 'NSArray *' in continuation class does not match property
type in primary class}}
+@property(nonatomic,readwrite,retain) NSArray* err_outline; // expected-error
{{type of property 'NSArray *' in class extension does not match property type
in primary class}}
@end
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
