maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename "secondary initializer" -> "convenience initializer" in the warnings, which is a more correct and consistent term. 

llvm-svn: 208142
This commit is contained in:
Argyrios Kyrtzidis 2014-05-06 23:24:16 +00:00
parent ba8a99cf77
commit 37b7b2aefc
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -2537,10 +2537,10 @@ def warn_objc_designated_init_non_designated_init_call : Warning<
"designated initializer invoked a non-designated initializer">,
InGroup<ObjCDesignatedInit>;
def warn_objc_secondary_init_super_init_call : Warning<
"secondary initializer should not invoke an initializer on 'super'">,
"convenience initializer should not invoke an initializer on 'super'">,
InGroup<ObjCDesignatedInit>;
def warn_objc_secondary_init_missing_init_call : Warning<
"secondary initializer missing a 'self' call to another initializer">,
"convenience initializer missing a 'self' call to another initializer">,
InGroup<ObjCDesignatedInit>;
def warn_objc_implementation_missing_designated_init_override : Warning<
"method override for the designated initializer of the superclass %objcinstance0 not found">,

14
clang/test/SemaObjC/attr-designated-init.m
View File

@ -29,7 +29,7 @@ __attribute__((objc_root_class))
+(id)init { return 0; }
-(id)init3 { return 0; }
-(id)init4 NS_DESIGNATED_INITIALIZER { return 0; } // expected-error {{only applies to init methods of interface or class extension declarations}} \
// expected-warning {{secondary initializer missing a 'self' call to another initializer}}
// expected-warning {{convenience initializer missing a 'self' call to another initializer}}
@end
__attribute__((objc_root_class))
@ -44,7 +44,7 @@ __attribute__((objc_root_class))
@implementation B1
-(id)initB1 { return 0; }
-(id)initB2 { return 0; } // expected-warning {{secondary initializer missing a 'self' call to another initializer}}
-(id)initB2 { return 0; } // expected-warning {{convenience initializer missing a 'self' call to another initializer}}
-(id)initB3 { return 0; }
@end
@ -156,8 +156,8 @@ __attribute__((objc_root_class))
-(id)initS1 {
return [super initB1];
}
-(id)initS2 { // expected-warning {{secondary initializer missing a 'self' call to another initializer}}
return [super initB1]; // expected-warning {{secondary initializer should not invoke an initializer on 'super'}}
-(id)initS2 { // expected-warning {{convenience initializer missing a 'self' call to another initializer}}
return [super initB1]; // expected-warning {{convenience initializer should not invoke an initializer on 'super'}}
}
-(id)initS3 {
return [self initB1];
@ -166,13 +166,13 @@ __attribute__((objc_root_class))
return [self initS1];
}
-(id)initS5 {
[super initB1]; // expected-warning {{secondary initializer should not invoke an initializer on 'super'}}
[super initB1]; // expected-warning {{convenience initializer should not invoke an initializer on 'super'}}
void (^blk)(void) = ^{
[super initB1]; // expected-warning {{secondary initializer should not invoke an initializer on 'super'}}
[super initB1]; // expected-warning {{convenience initializer should not invoke an initializer on 'super'}}
};
return [self initS1];
}
-(id)initS6 { // expected-warning {{secondary initializer missing a 'self' call to another initializer}}
-(id)initS6 { // expected-warning {{convenience initializer missing a 'self' call to another initializer}}
S6 *s;
return [s initS1];
}