From 1d6aac5b6ade8beb1a614ae53eadafc53aed471e Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Thu, 3 Jan 2013 01:30:20 +0000 Subject: [PATCH] Fix capitalization of Objective-C in diagnostic. llvm-svn: 171440 --- clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 +- clang/test/Analysis/misc-ps-region-store.m | 2 +- clang/test/SemaObjC/warn-isa-ref.m | 12 ++++++------ clang/test/SemaObjCXX/instantiate-expr.mm | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 934bb30cfad0..494ddfd0902d 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -614,7 +614,7 @@ def warn_objc_property_no_assignment_attribute : Warning< "'assign' is assumed">, InGroup; def warn_objc_isa_use : Warning< - "direct access to objective-c's isa is deprecated " + "direct access to Objective-C's isa is deprecated " "in favor of object_setClass() and object_getClass()">, InGroup>; def warn_objc_property_default_assign_on_object : Warning< diff --git a/clang/test/Analysis/misc-ps-region-store.m b/clang/test/Analysis/misc-ps-region-store.m index f772894ff820..a7fbd66d6808 100644 --- a/clang/test/Analysis/misc-ps-region-store.m +++ b/clang/test/Analysis/misc-ps-region-store.m @@ -920,7 +920,7 @@ int rdar_7770737_pos(void) void pr6302(id x, Class y) { // This previously crashed the analyzer (reported in PR 6302) - x->isa = y; // expected-warning {{direct access to objective-c's isa is deprecated in favor of object_setClass() and object_getClass()}} + x->isa = y; // expected-warning {{direct access to Objective-C's isa is deprecated in favor of object_setClass() and object_getClass()}} } //===----------------------------------------------------------------------===// diff --git a/clang/test/SemaObjC/warn-isa-ref.m b/clang/test/SemaObjC/warn-isa-ref.m index 9d7abd48adff..c20474d5b0d9 100644 --- a/clang/test/SemaObjC/warn-isa-ref.m +++ b/clang/test/SemaObjC/warn-isa-ref.m @@ -18,8 +18,8 @@ static void func() { id x; // rdar://8290002 - [(*x).isa self]; // expected-warning {{direct access to objective-c's isa is deprecated in favor of object_setClass() and object_getClass()}} - [x->isa self]; // expected-warning {{direct access to objective-c's isa is deprecated in favor of object_setClass() and object_getClass()}} + [(*x).isa self]; // expected-warning {{direct access to Objective-C's isa is deprecated in favor of object_setClass() and object_getClass()}} + [x->isa self]; // expected-warning {{direct access to Objective-C's isa is deprecated in favor of object_setClass() and object_getClass()}} Whatever *y; @@ -72,10 +72,10 @@ static void func() { Subclass *x; SiblingClass *y; OtherClass *z; - (void)v->isa; // expected-warning {{direct access to objective-c's isa is deprecated}} - (void)w->isa; // expected-warning {{direct access to objective-c's isa is deprecated}} - (void)x->isa; // expected-warning {{direct access to objective-c's isa is deprecated}} - (void)y->isa; // expected-warning {{direct access to objective-c's isa is deprecated}} + (void)v->isa; // expected-warning {{direct access to Objective-C's isa is deprecated}} + (void)w->isa; // expected-warning {{direct access to Objective-C's isa is deprecated}} + (void)x->isa; // expected-warning {{direct access to Objective-C's isa is deprecated}} + (void)y->isa; // expected-warning {{direct access to Objective-C's isa is deprecated}} (void)z->isa; (void)u->isa; } diff --git a/clang/test/SemaObjCXX/instantiate-expr.mm b/clang/test/SemaObjCXX/instantiate-expr.mm index 75a5b7eaf855..071bf6bcedd6 100644 --- a/clang/test/SemaObjCXX/instantiate-expr.mm +++ b/clang/test/SemaObjCXX/instantiate-expr.mm @@ -21,7 +21,7 @@ void f(U value, V value2) { get_an_A(N)->ivar = value; // expected-error{{assigning to 'int' from incompatible type 'int *'}} get_an_A(N).prop = value2; // expected-error{{assigning to 'int' from incompatible type 'double *'}} T c = get_an_id(N)->isa; // expected-error{{cannot initialize a variable of type 'int' with an lvalue of type 'Class'}} \ - // expected-warning 5 {{direct access to objective-c's isa is deprecated in favor of object_setClass() and object_getClass()}} + // expected-warning 5 {{direct access to Objective-C's isa is deprecated in favor of object_setClass() and object_getClass()}} } template void f<6, Class>(int, int); // expected-note{{in instantiation of}} @@ -46,7 +46,7 @@ template void f2(A*, int, double*); // expected-note{{instantiation of}} template void f3(U ptr) { T c = ptr->isa; // expected-error{{cannot initialize a variable of type 'int' with an lvalue of type 'Class'}} \ - // expected-warning 2 {{direct access to objective-c's isa is deprecated in favor of object_setClass() and object_getClass()}} + // expected-warning 2 {{direct access to Objective-C's isa is deprecated in favor of object_setClass() and object_getClass()}} } template void f3(id); // expected-note{{in instantiation of}}