[cfe-commits] r164559 - in /cfe/trunk: include/clang/Basic/ test/FixIt/ test/SemaObjC/ test/SemaObjCXX/
Fariborz Jahanian
fjahanian at apple.com
Mon Sep 24 15:00:36 PDT 2012
Author: fjahanian
Date: Mon Sep 24 17:00:36 2012
New Revision: 164559
URL: http://llvm.org/viewvc/llvm-project?rev=164559&view=rev
Log:
objective-C: remove use of 'ivar' in favor of
'instance variable' in text of all diagnostics
for objective-C: // rdar://12352442
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/FixIt/fixit-objc.m
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/arc-unavailable-for-weakref.m
cfe/trunk/test/SemaObjC/default-synthesize-2.m
cfe/trunk/test/SemaObjC/error-property-gc-attr.m
cfe/trunk/test/SemaObjC/iboutletcollection-attr.m
cfe/trunk/test/SemaObjC/ivar-in-class-extension-error.m
cfe/trunk/test/SemaObjC/ivar-in-class-extension.m
cfe/trunk/test/SemaObjC/ivar-sem-check-2.m
cfe/trunk/test/SemaObjC/no-ivar-in-interface-block.m
cfe/trunk/test/SemaObjC/property-and-class-extension.m
cfe/trunk/test/SemaObjC/property-impl-misuse.m
cfe/trunk/test/SemaObjC/property-ivar-mismatch.m
cfe/trunk/test/SemaObjC/property.m
cfe/trunk/test/SemaObjC/warn-direct-ivar-access.m
cfe/trunk/test/SemaObjC/warn-isa-ref.m
cfe/trunk/test/SemaObjC/weak-property.m
cfe/trunk/test/SemaObjCXX/abstract-class-type-ivar.mm
cfe/trunk/test/SemaObjCXX/propert-dot-error.mm
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Mon Sep 24 17:00:36 2012
@@ -695,7 +695,7 @@
"property implementation must be in a class or category implementation">;
def error_missing_property_ivar_decl : Error<
"synthesized property %0 must either be named the same as a compatible"
- " ivar or must explicitly name an ivar">;
+ " instance variable or must explicitly name an instance variable">;
def error_synthesize_weak_non_arc_or_gc : Error<
"@synthesize of 'weak' property is only allowed in ARC or GC mode">;
def err_arc_perform_selector_retains : Error<
@@ -713,19 +713,19 @@
"cannot synthesize property %0 with incomplete type %1">;
def error_property_ivar_type : Error<
- "type of property %0 (%1) does not match type of ivar %2 (%3)">;
+ "type of property %0 (%1) does not match type of instance variable %2 (%3)">;
def error_property_accessor_type : Error<
"type of property %0 (%1) does not match type of accessor %2 (%3)">;
def error_ivar_in_superclass_use : Error<
- "property %0 attempting to use ivar %1 declared in super class %2">;
+ "property %0 attempting to use instance variable %1 declared in super class %2">;
def error_weak_property : Error<
- "existing ivar %1 for __weak property %0 must be __weak">;
+ "existing instance variable %1 for __weak property %0 must be __weak">;
def error_strong_property : Error<
- "existing ivar %1 for strong property %0 may not be __weak">;
+ "existing instance variable %1 for strong property %0 may not be __weak">;
def error_dynamic_property_ivar_decl : Error<
- "dynamic property can not have ivar specification">;
+ "dynamic property can not have instance variable specification">;
def error_duplicate_ivar_use : Error<
- "synthesized properties %0 and %1 both claim ivar %2">;
+ "synthesized properties %0 and %1 both claim instance variable %2">;
def error_property_implemented : Error<"property %0 is already implemented">;
def warn_objc_property_attr_mutually_exclusive : Warning<
"property attributes '%0' and '%1' are mutually exclusive">,
@@ -813,7 +813,7 @@
"'friend' must appear first in a non-function declaration">;
def err_abstract_type_in_decl : Error<
- "%select{return|parameter|variable|field|ivar}0 type %1 is an abstract class">;
+ "%select{return|parameter|variable|field|instance variable}0 type %1 is an abstract class">;
def err_allocation_of_abstract_type : Error<
"allocating an object of abstract class type %0">;
def err_throw_abstract_type : Error<
@@ -1028,7 +1028,7 @@
"not available in the %select{constructor|destructor}1 of %2">;
def note_field_decl : Note<"member is declared here">;
-def note_ivar_decl : Note<"ivar is declared here">;
+def note_ivar_decl : Note<"instance variable is declared here">;
def note_bitfield_decl : Note<"bit-field is declared here">;
def note_previous_decl : Note<"%0 declared here">;
def note_member_synthesized_at : Note<
@@ -2047,7 +2047,7 @@
def err_iboutletcollection_type : Error<
"invalid type %0 as argument of iboutletcollection attribute">;
def warn_iboutlet_object_type : Warning<
- "%select{ivar|property}2 with %0 attribute must "
+ "%select{instance variable|property}2 with %0 attribute must "
"be an object type (invalid %1)">,
InGroup<DiagGroup<"invalid-iboutlet">>;
def err_attribute_overloadable_not_function : Error<
@@ -3235,9 +3235,9 @@
def err_redefinition_of_enumerator : Error<"redefinition of enumerator %0">;
def err_duplicate_member : Error<"duplicate member %0">;
def err_misplaced_ivar : Error<
- "ivars may not be placed in %select{categories|class extension}0">;
+ "instance variable may not be placed in %select{categories|class extension}0">;
def warn_ivars_in_interface : Warning<
- "declaration of ivars in the interface is deprecated">,
+ "declaration of instance variables in the interface is deprecated">,
InGroup<DiagGroup<"objc-interface-ivars">>, DefaultIgnore;
def ext_enum_value_not_int : Extension<
"ISO C restricts enumerator values to range of 'int' (%0 is too "
@@ -3547,7 +3547,7 @@
"assignment of a weak-unavailable object to a __weak object">;
def err_arc_weak_unavailable_property : Error<
"synthesis of a weak-unavailable property is disallowed "
- "because it requires synthesis of an ivar of the __weak object">;
+ "because it requires synthesis of an instance variable of the __weak object">;
def err_arc_convesion_of_weak_unavailable : Error<
"%select{implicit conversion|cast}0 of weak-unavailable object of type %1 to"
" a __weak object of type %2">;
@@ -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|ivars}0 cannot have "
+ "%select{__block variables|global variables|fields|instance variable}0 cannot have "
"__autoreleasing ownership">;
def err_arc_autoreleasing_capture : Error<
"cannot capture __autoreleasing variable in a "
@@ -3671,10 +3671,10 @@
let CategoryName = "ARC and @properties" in {
def err_arc_strong_property_ownership : Error<
- "existing ivar %1 for strong property %0 may not be "
+ "existing instance variable %1 for strong property %0 may not be "
"%select{|__unsafe_unretained||__weak}2">;
def err_arc_assign_property_ownership : Error<
- "existing ivar %1 for property %0 with %select{unsafe_unretained| assign}2 "
+ "existing instance variable %1 for property %0 with %select{unsafe_unretained| assign}2 "
"attribute must be __unsafe_unretained">;
def err_arc_inconsistent_property_ownership : Error<
"%select{|unsafe_unretained|strong|weak}1 property %0 may not also be "
@@ -4210,7 +4210,7 @@
def error_no_subobject_property_setting : Error<
"expression is not assignable">;
def err_qualified_objc_access : Error<
- "%select{property|ivar}0 access cannot be qualified with '%1'">;
+ "%select{property|instance variable}0 access cannot be qualified with '%1'">;
def ext_freestanding_complex : Extension<
"complex numbers are an extension in a freestanding C99 implementation">;
@@ -5879,7 +5879,7 @@
def err_property_not_found_suggest : Error<
"property %0 not found on object of type %1; did you mean %2?">;
def err_ivar_access_using_property_syntax_suggest : Error<
- "property %0 not found on object of type %1; did you mean to access ivar %2?">;
+ "property %0 not found on object of type %1; did you mean to access instance variable %2?">;
def err_property_found_suggest : Error<
"property %0 found on object of type %1; did you mean to access "
"it with the \".\" operator?">;
Modified: cfe/trunk/test/FixIt/fixit-objc.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-objc.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/FixIt/fixit-objc.m (original)
+++ cfe/trunk/test/FixIt/fixit-objc.m Mon Sep 24 17:00:36 2012
@@ -49,7 +49,7 @@
@property (assign) int y;
@end
-int f0(Radar7861841 *a) { return a.x; } // expected-error {{property 'x' not found on object of type 'Radar7861841 *'; did you mean to access ivar 'x'}}
+int f0(Radar7861841 *a) { return a.x; } // expected-error {{property 'x' not found on object of type 'Radar7861841 *'; did you mean to access instance variable 'x'}}
int f1(Radar7861841 *a) { return a->y; } // expected-error {{property 'y' found on object of type 'Radar7861841 *'; did you mean to access it with the "." operator?}}
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=164559&r1=164558&r2=164559&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:00:36 2012
@@ -5,7 +5,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{ivars cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variable 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 {{ivars cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variable 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 {{ivars cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variable 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=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/arc-property-lifetime.m (original)
+++ cfe/trunk/test/SemaObjC/arc-property-lifetime.m Mon Sep 24 17:00:36 2012
@@ -5,7 +5,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{ivars cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
}
@property(strong) id x; // expected-note {{property declared here}}
@property(strong) id y; // expected-note {{property declared here}}
@@ -13,8 +13,8 @@
@end
@implementation Foo
- at synthesize x; // expected-error {{existing ivar 'x' for strong property 'x' may not be __unsafe_unretained}}
- at synthesize y; // expected-error {{existing ivar 'y' for strong property 'y' may not be __weak}}
+ at synthesize x; // expected-error {{existing instance variable 'x' for strong property 'x' may not be __unsafe_unretained}}
+ at synthesize y; // expected-error {{existing instance variable 'y' for strong property 'y' may not be __weak}}
@synthesize z; // suppressed
@end
@@ -22,7 +22,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{ivars cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
}
@property(retain) id x; // expected-note {{property declared here}}
@property(retain) id y; // expected-note {{property declared here}}
@@ -30,8 +30,8 @@
@end
@implementation Bar
- at synthesize x; // expected-error {{existing ivar 'x' for strong property 'x' may not be __unsafe_unretained}}
- at synthesize y; // expected-error {{existing ivar 'y' for strong property 'y' may not be __weak}}
+ at synthesize x; // expected-error {{existing instance variable 'x' for strong property 'x' may not be __unsafe_unretained}}
+ at synthesize y; // expected-error {{existing instance variable 'y' for strong property 'y' may not be __weak}}
@synthesize z; // suppressed
@end
@@ -39,7 +39,7 @@
@public
id __unsafe_unretained x;
id __weak y;
- id __autoreleasing z; // expected-error {{ivars cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
}
@property(copy) id x; // expected-note {{property declared here}}
@property(copy) id y; // expected-note {{property declared here}}
@@ -47,8 +47,8 @@
@end
@implementation Bas
- at synthesize x; // expected-error {{existing ivar 'x' for strong property 'x' may not be __unsafe_unretained}}
- at synthesize y; // expected-error {{existing ivar 'y' for strong property 'y' may not be __weak}}
+ at synthesize x; // expected-error {{existing instance variable 'x' for strong property 'x' may not be __unsafe_unretained}}
+ at synthesize y; // expected-error {{existing instance variable 'y' for strong property 'y' may not be __weak}}
@synthesize z; // suppressed
@end
@@ -79,7 +79,7 @@
@implementation Gorf
@synthesize x;
- at synthesize y; // expected-error {{existing ivar 'y' for property 'y' with assign attribute must be __unsafe_unretained}}
+ at synthesize y; // expected-error {{existing instance variable 'y' for property 'y' with assign attribute must be __unsafe_unretained}}
@synthesize z;
@end
@@ -94,7 +94,7 @@
@implementation Gorf2
@synthesize x;
- at synthesize y; // expected-error {{existing ivar 'y' for property 'y' with unsafe_unretained attribute must be __unsafe_unretained}}
+ at synthesize y; // expected-error {{existing instance variable 'y' for property 'y' with unsafe_unretained attribute must be __unsafe_unretained}}
@synthesize z;
@end
Modified: cfe/trunk/test/SemaObjC/arc-property.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-property.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/arc-property.m (original)
+++ cfe/trunk/test/SemaObjC/arc-property.m Mon Sep 24 17:00:36 2012
@@ -18,13 +18,13 @@
@end
@implementation MyClass
- at synthesize myString; // expected-error {{existing ivar 'myString' for strong property 'myString' may not be __weak}}
+ at synthesize myString; // expected-error {{existing instance variable 'myString' for strong property 'myString' may not be __weak}}
@synthesize myString1 = StrongIvar; // OK
- at synthesize myString2 = myString2; // expected-error {{existing ivar 'myString2' for strong property 'myString2' may not be __weak}}
+ at synthesize myString2 = myString2; // expected-error {{existing instance variable 'myString2' for strong property 'myString2' may not be __weak}}
//
@synthesize myString3; // OK
@synthesize myString4; // OK
- at synthesize myString5 = StrongIvar5; // expected-error {{existing ivar 'StrongIvar5' for __weak property 'myString5' must be __weak}}
+ at synthesize myString5 = StrongIvar5; // expected-error {{existing instance variable 'StrongIvar5' for __weak property 'myString5' must be __weak}}
@end
@@ -33,7 +33,7 @@
@public
id __unsafe_unretained x; // should be __weak
id __strong y;
- id __autoreleasing z; // expected-error {{ivars cannot have __autoreleasing ownership}}
+ id __autoreleasing z; // expected-error {{instance variable cannot have __autoreleasing ownership}}
}
@property(weak) id x; // expected-note {{property declared here}}
@property(weak) id y; // expected-note {{property declared here}}
@@ -41,8 +41,8 @@
@end
@implementation Foo
- at synthesize x; // expected-error {{existing ivar 'x' for __weak property 'x' must be __weak}}
- at synthesize y; // expected-error {{existing ivar 'y' for __weak property 'y' must be __weak}}
+ at synthesize x; // expected-error {{existing instance variable 'x' for __weak property 'x' must be __weak}}
+ at synthesize y; // expected-error {{existing instance variable 'y' for __weak property 'y' must be __weak}}
@synthesize z; // suppressed
@end
Modified: cfe/trunk/test/SemaObjC/arc-unavailable-for-weakref.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-unavailable-for-weakref.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/arc-unavailable-for-weakref.m (original)
+++ cfe/trunk/test/SemaObjC/arc-unavailable-for-weakref.m Mon Sep 24 17:00:36 2012
@@ -60,5 +60,5 @@
@end
@implementation I
- at synthesize font = _font; // expected-error {{synthesis of a weak-unavailable property is disallowed because it requires synthesis of an ivar of the __weak object}}
+ at synthesize font = _font; // expected-error {{synthesis of a weak-unavailable property is disallowed because it requires synthesis of an instance variable of the __weak object}}
@end
Modified: cfe/trunk/test/SemaObjC/default-synthesize-2.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/default-synthesize-2.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/default-synthesize-2.m (original)
+++ cfe/trunk/test/SemaObjC/default-synthesize-2.m Mon Sep 24 17:00:36 2012
@@ -41,7 +41,7 @@
// Test3
@interface Test3
{
- id uid; // expected-note {{ivar is declared here}}
+ id uid; // expected-note {{instance variable is declared here}}
}
@property (readwrite, assign) id uid; // expected-note {{property declared here}}
@end
@@ -119,7 +119,7 @@
@interface Test8
{
id _y;
- id y; // expected-note {{ivar is declared here}}
+ id y; // expected-note {{instance variable is declared here}}
}
@property(copy) id y; // expected-note {{property declared here}}
@end
Modified: cfe/trunk/test/SemaObjC/error-property-gc-attr.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/error-property-gc-attr.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/error-property-gc-attr.m (original)
+++ cfe/trunk/test/SemaObjC/error-property-gc-attr.m Mon Sep 24 17:00:36 2012
@@ -3,7 +3,7 @@
@interface INTF
{
- id IVAR; // expected-note {{ivar is declared here}}
+ id IVAR; // expected-note {{instance variable is declared here}}
__weak id II;
__weak id WID;
id ID;
@@ -19,10 +19,10 @@
@end
@implementation INTF
- at synthesize pweak=IVAR; // expected-error {{existing ivar 'IVAR' for __weak property 'pweak' must be __weak}}
- at synthesize NOT=II; // expected-error {{existing ivar 'II' for strong property 'NOT' may not be __weak}}
+ at synthesize pweak=IVAR; // expected-error {{existing instance variable 'IVAR' for __weak property 'pweak' must be __weak}}
+ at synthesize NOT=II; // expected-error {{existing instance variable 'II' for strong property 'NOT' may not be __weak}}
@synthesize WID;
@synthesize ID;
- at synthesize AWEAK; // expected-error {{existing ivar 'AWEAK' for strong property 'AWEAK' may not be __weak}}
+ at synthesize AWEAK; // expected-error {{existing instance variable 'AWEAK' for strong property 'AWEAK' may not be __weak}}
@synthesize WI;
@end
Modified: cfe/trunk/test/SemaObjC/iboutletcollection-attr.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/iboutletcollection-attr.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/iboutletcollection-attr.m (original)
+++ cfe/trunk/test/SemaObjC/iboutletcollection-attr.m Mon Sep 24 17:00:36 2012
@@ -21,9 +21,9 @@
__attribute__((iboutletcollection(I, 1))) id ivar1; // expected-error {{attribute takes one argument}}
__attribute__((iboutletcollection(B))) id ivar2; // expected-error {{invalid type 'B' as argument of iboutletcollection attribute}}
__attribute__((iboutletcollection(PV))) id ivar3; // expected-error {{invalid type 'PV' as argument of iboutletcollection attribute}}
- __attribute__((iboutletcollection(PV))) void *ivar4; // expected-warning {{ivar with 'iboutletcollection' attribute must be an object type (invalid 'void *')}}
+ __attribute__((iboutletcollection(PV))) void *ivar4; // expected-warning {{instance variable with 'iboutletcollection' attribute must be an object type (invalid 'void *')}}
__attribute__((iboutletcollection(int))) id ivar5; // expected-error {{type argument of iboutletcollection attribute cannot be a builtin type}}
- __attribute__((iboutlet)) int ivar6; // expected-warning {{ivar with 'iboutlet' attribute must be an object type}}
+ __attribute__((iboutlet)) int ivar6; // expected-warning {{instance variable with 'iboutlet' attribute must be an object type}}
}
@property (nonatomic, retain) __attribute__((iboutletcollection(I,2,3))) id prop1; // expected-error {{attribute takes one argument}}
@property (nonatomic, retain) __attribute__((iboutletcollection(B))) id prop2; // expected-error {{invalid type 'B' as argument of iboutletcollection attribute}}
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=164559&r1=164558&r2=164559&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:00:36 2012
@@ -4,12 +4,12 @@
@interface A @end
@interface A () {
- int _p0; // expected-error {{ivars may not be placed in class extension}}
+ int _p0; // expected-error {{instance variable may not be placed in class extension}}
}
@property int p0;
@end
@interface A(CAT) {
- int _p1; // expected-error {{ivars may not be placed in categories}}
+ int _p1; // expected-error {{instance variable 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=164559&r1=164558&r2=164559&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:00:36 2012
@@ -32,7 +32,7 @@
@interface SomeClass (Category)
{
- int categoryIvar; // expected-error {{ivars may not be placed in categories}}
+ int categoryIvar; // expected-error {{instance variable may not be placed in categories}}
}
@end
Modified: cfe/trunk/test/SemaObjC/ivar-sem-check-2.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/ivar-sem-check-2.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/ivar-sem-check-2.m (original)
+++ cfe/trunk/test/SemaObjC/ivar-sem-check-2.m Mon Sep 24 17:00:36 2012
@@ -16,8 +16,8 @@
@implementation Sub
@synthesize value; // expected-note {{previous use is here}}
- at synthesize value1=value; // expected-error {{synthesized properties 'value1' and 'value' both claim ivar 'value'}}
- at synthesize prop=value2; // expected-error {{property 'prop' attempting to use ivar 'value2' declared in super class 'Super'}}
+ at synthesize value1=value; // expected-error {{synthesized properties 'value1' and 'value' both claim instance variable 'value'}}
+ at synthesize prop=value2; // expected-error {{property 'prop' attempting to use instance variable 'value2' declared in super class 'Super'}}
@end
Modified: cfe/trunk/test/SemaObjC/no-ivar-in-interface-block.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/no-ivar-in-interface-block.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/no-ivar-in-interface-block.m (original)
+++ cfe/trunk/test/SemaObjC/no-ivar-in-interface-block.m Mon Sep 24 17:00:36 2012
@@ -3,11 +3,11 @@
@interface I
{
- @protected int P_IVAR; // expected-warning {{declaration of ivars in the interface is deprecated}}
+ @protected int P_IVAR; // expected-warning {{declaration of instance variables in the interface is deprecated}}
- @public int PU_IVAR; // expected-warning {{declaration of ivars in the interface is deprecated}}
+ @public int PU_IVAR; // expected-warning {{declaration of instance variables in the interface is deprecated}}
- @private int PRV_IVAR; // expected-warning {{declaration of ivars in the interface is deprecated}}
+ @private int PRV_IVAR; // expected-warning {{declaration of instance variables in the interface is deprecated}}
}
@end
Modified: cfe/trunk/test/SemaObjC/property-and-class-extension.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property-and-class-extension.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/property-and-class-extension.m (original)
+++ cfe/trunk/test/SemaObjC/property-and-class-extension.m Mon Sep 24 17:00:36 2012
@@ -31,6 +31,6 @@
@end
@implementation SomeClass
- at synthesize Property; // expected-error {{property 'Property' attempting to use ivar 'Property' declared in super class 'Super'}}
+ at synthesize Property; // expected-error {{property 'Property' attempting to use instance variable 'Property' declared in super class 'Super'}}
@synthesize Property1; // OK
@end
Modified: cfe/trunk/test/SemaObjC/property-impl-misuse.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property-impl-misuse.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/property-impl-misuse.m (original)
+++ cfe/trunk/test/SemaObjC/property-impl-misuse.m Mon Sep 24 17:00:36 2012
@@ -12,7 +12,7 @@
@dynamic X; // expected-note {{previous declaration is here}}
@dynamic X; // expected-error {{property 'X' is already implemented}}
@synthesize Y; // expected-note {{previous use is here}}
- at synthesize Z=Y; // expected-error {{synthesized properties 'Z' and 'Y' both claim ivar 'Y'}}
+ at synthesize Z=Y; // expected-error {{synthesized properties 'Z' and 'Y' both claim instance variable 'Y'}}
@end
// rdar://8703553
Modified: cfe/trunk/test/SemaObjC/property-ivar-mismatch.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property-ivar-mismatch.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/property-ivar-mismatch.m (original)
+++ cfe/trunk/test/SemaObjC/property-ivar-mismatch.m Mon Sep 24 17:00:36 2012
@@ -3,24 +3,24 @@
@interface Test4
{
- char ivar; // expected-note{{ivar is declared here}}
+ char ivar; // expected-note{{instance variable is declared here}}
}
@property int prop;
@end
@implementation Test4
- at synthesize prop = ivar; // expected-error {{type of property 'prop' ('int') does not match type of ivar 'ivar' ('char')}}
+ at synthesize prop = ivar; // expected-error {{type of property 'prop' ('int') does not match type of instance variable 'ivar' ('char')}}
@end
@interface Test5
{
- void * _P; // expected-note {{ivar is declared here}}
+ void * _P; // expected-note {{instance variable is declared here}}
}
@property int P;
@end
@implementation Test5
- at synthesize P=_P; // expected-error {{ype of property 'P' ('int') does not match type of ivar '_P' ('void *')}}
+ at synthesize P=_P; // expected-error {{ype of property 'P' ('int') does not match type of instance variable '_P' ('void *')}}
@end
Modified: cfe/trunk/test/SemaObjC/property.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/property.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/property.m (original)
+++ cfe/trunk/test/SemaObjC/property.m Mon Sep 24 17:00:36 2012
@@ -2,7 +2,7 @@
@interface I
{
- int IVAR; // expected-note{{ivar is declared here}}
+ int IVAR; // expected-note{{instance variable is declared here}}
int name;
}
@property int d1;
@@ -18,7 +18,7 @@
@synthesize d1; // expected-error {{synthesized property 'd1' must either be named the same as}}
@dynamic bad; // expected-error {{property implementation must have its declaration in interface 'I'}}
@synthesize prop_id; // expected-error {{synthesized property 'prop_id' must either be named the same}} // expected-note {{previous declaration is here}}
- at synthesize prop_id = IVAR; // expected-error {{type of property 'prop_id' ('id') does not match type of ivar 'IVAR' ('int')}} // expected-error {{property 'prop_id' is already implemented}}
+ at synthesize prop_id = IVAR; // expected-error {{type of property 'prop_id' ('id') does not match type of instance variable 'IVAR' ('int')}} // expected-error {{property 'prop_id' is already implemented}}
@synthesize name; // OK! property with same name as an accessible ivar of same name
@end
Modified: cfe/trunk/test/SemaObjC/warn-direct-ivar-access.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/warn-direct-ivar-access.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/warn-direct-ivar-access.m (original)
+++ cfe/trunk/test/SemaObjC/warn-direct-ivar-access.m Mon Sep 24 17:00:36 2012
@@ -15,7 +15,7 @@
@implementation MyObject
@synthesize myMaster = _myMaster;
- at synthesize isTickledPink = _isTickledPink; // expected-error {{existing ivar '_isTickledPink' for property 'isTickledPink'}}
+ at synthesize isTickledPink = _isTickledPink; // expected-error {{existing instance variable '_isTickledPink' for property 'isTickledPink'}}
@synthesize myIntProp = _myIntProp;
- (void) doSomething {
Modified: cfe/trunk/test/SemaObjC/warn-isa-ref.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/warn-isa-ref.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/warn-isa-ref.m (original)
+++ cfe/trunk/test/SemaObjC/warn-isa-ref.m Mon Sep 24 17:00:36 2012
@@ -41,7 +41,7 @@
@interface BaseClass {
@public
- Class isa; // expected-note 3 {{ivar is declared here}}
+ Class isa; // expected-note 3 {{instance variable is declared here}}
}
@end
Modified: cfe/trunk/test/SemaObjC/weak-property.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/weak-property.m?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/weak-property.m (original)
+++ cfe/trunk/test/SemaObjC/weak-property.m Mon Sep 24 17:00:36 2012
@@ -19,6 +19,6 @@
@end
@implementation WeakPropertyTest
- at synthesize x; // expected-error {{existing ivar 'x' for __weak property 'x' must be __weak}}
+ at synthesize x; // expected-error {{existing instance variable 'x' for __weak property 'x' must be __weak}}
@dynamic value1, value, value2, v1,v2,v3,v4;
@end
Modified: cfe/trunk/test/SemaObjCXX/abstract-class-type-ivar.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/abstract-class-type-ivar.mm?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjCXX/abstract-class-type-ivar.mm (original)
+++ cfe/trunk/test/SemaObjCXX/abstract-class-type-ivar.mm Mon Sep 24 17:00:36 2012
@@ -13,7 +13,7 @@
};
@interface Objc {
- CppConcreteSub _concrete; // expected-error{{ivar type 'CppConcreteSub' is an abstract class}}
+ CppConcreteSub _concrete; // expected-error{{instance variable type 'CppConcreteSub' is an abstract class}}
}
- (CppAbstractBase*)abstract;
@end
Modified: cfe/trunk/test/SemaObjCXX/propert-dot-error.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/propert-dot-error.mm?rev=164559&r1=164558&r2=164559&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjCXX/propert-dot-error.mm (original)
+++ cfe/trunk/test/SemaObjCXX/propert-dot-error.mm Mon Sep 24 17:00:36 2012
@@ -63,7 +63,7 @@
void testD(D *d) {
d.Forward::property = 17; // expected-error{{property access cannot be qualified with 'Forward::'}}
- d->Forward::ivar = 12; // expected-error{{ivar access cannot be qualified with 'Forward::'}}
+ d->Forward::ivar = 12; // expected-error{{instance variable access cannot be qualified with 'Forward::'}}
d.D::property = 17; // expected-error{{expected a class or namespace}}
d->D::ivar = 12; // expected-error{{expected a class or namespace}}
}
More information about the cfe-commits
mailing list