From 6e45b376c6c4086019d8a7e8eb29fc28a20e71f7 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Sun, 19 Dec 2010 15:13:54 +0000 Subject: In gcc/testsuite/: 2010-12-19 Nicola Pero In gcc/testsuite/: 2010-12-19 Nicola Pero * objc.dg/gnu-api-2-objc.m: Fixed test to test objc_lookUpClass, not objc_lookupClass. * obj-c++.dg/gnu-api-2-objc.mm: Same change. In libobjc/: 2010-12-19 Nicola Pero * class.c (objc_lookupClass): Renamed to objc_lookUpClass. * protocols.c: Updated all calls to objc_lookupClass to call objc_lookUpClass instead. * sendmsg.c (objc_lookupClass): Do not declare. (get_imp): Update call to objc_lookupClass to call objc_lookUpClass instead. * objc/runtime.h (objc_lookupClass): Renamed to objc_lookUpClass. From-SVN: r168059 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/obj-c++.dg/gnu-api-2-objc.mm | 4 ++-- gcc/testsuite/objc.dg/gnu-api-2-objc.m | 4 ++-- libobjc/ChangeLog | 10 ++++++++++ libobjc/class.c | 2 +- libobjc/objc/runtime.h | 2 +- libobjc/protocols.c | 20 ++++++++++---------- libobjc/sendmsg.c | 5 +---- 8 files changed, 33 insertions(+), 20 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0696079..762d86d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2010-12-19 Nicola Pero + * objc.dg/gnu-api-2-objc.m: Fixed test to test objc_lookUpClass, + not objc_lookupClass. + * obj-c++.dg/gnu-api-2-objc.mm: Same change. + +2010-12-19 Nicola Pero + * objc.dg/gnu-api-2-objc_msg_lookup.m: New. * obj-c++.dg/gnu-api-2-objc_msg_lookup.mm: New. diff --git a/gcc/testsuite/obj-c++.dg/gnu-api-2-objc.mm b/gcc/testsuite/obj-c++.dg/gnu-api-2-objc.mm index e9bdee8..4761278 100644 --- a/gcc/testsuite/obj-c++.dg/gnu-api-2-objc.mm +++ b/gcc/testsuite/obj-c++.dg/gnu-api-2-objc.mm @@ -204,9 +204,9 @@ int main () abort (); } - std::cout << "Testing objc_lookupClass ()...\n"; + std::cout << "Testing objc_lookUpClass ()...\n"; { - if (std::strcmp (class_getName (objc_lookupClass ("MyRootClass")), + if (std::strcmp (class_getName (objc_lookUpClass ("MyRootClass")), "MyRootClass") != 0) abort (); } diff --git a/gcc/testsuite/objc.dg/gnu-api-2-objc.m b/gcc/testsuite/objc.dg/gnu-api-2-objc.m index 802e5c8..c7f3946 100644 --- a/gcc/testsuite/objc.dg/gnu-api-2-objc.m +++ b/gcc/testsuite/objc.dg/gnu-api-2-objc.m @@ -204,9 +204,9 @@ int main(int argc, void **args) abort (); } - printf ("Testing objc_lookupClass ()...\n"); + printf ("Testing objc_lookUpClass ()...\n"); { - if (strcmp (class_getName (objc_lookupClass ("MyRootClass")), + if (strcmp (class_getName (objc_lookUpClass ("MyRootClass")), "MyRootClass") != 0) abort (); } diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 00eae0b..7dc29b8 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,5 +1,15 @@ 2010-12-19 Nicola Pero + * class.c (objc_lookupClass): Renamed to objc_lookUpClass. + * protocols.c: Updated all calls to objc_lookupClass to call + objc_lookUpClass instead. + * sendmsg.c (objc_lookupClass): Do not declare. + (get_imp): Update call to objc_lookupClass to call + objc_lookUpClass instead. + * objc/runtime.h (objc_lookupClass): Renamed to objc_lookUpClass. + +2010-12-19 Nicola Pero + * objc/runtime.h (class_ivar_set_gcinvisible): Declare. * sendmsg.c (_CLS_IN_CONSTRUCTION, CLS_IS_IN_CONSTRUCTION): Do not define. Updated comments. diff --git a/libobjc/class.c b/libobjc/class.c index d606a35..cf8e4c4 100644 --- a/libobjc/class.c +++ b/libobjc/class.c @@ -501,7 +501,7 @@ objc_getClass (const char *name) } Class -objc_lookupClass (const char *name) +objc_lookUpClass (const char *name) { if (name == NULL) return Nil; diff --git a/libobjc/objc/runtime.h b/libobjc/objc/runtime.h index b323f99..758d2d0 100644 --- a/libobjc/objc/runtime.h +++ b/libobjc/objc/runtime.h @@ -427,7 +427,7 @@ objc_EXPORT Class objc_getClass (const char *name); the runtime. Return Nil if not. This function does not call the objc_get_unknown_class_handler function if the class is not found. */ -objc_EXPORT Class objc_lookupClass (const char *name); +objc_EXPORT Class objc_lookUpClass (const char *name); /* Return the meta class associated to the class with name 'name', if it is already registered with the runtime. First, it finds the diff --git a/libobjc/protocols.c b/libobjc/protocols.c index cc694c4..3ff6fba 100644 --- a/libobjc/protocols.c +++ b/libobjc/protocols.c @@ -145,7 +145,7 @@ class_addProtocol (Class class_, Protocol *protocol) /* Check that it is a Protocol object before casting it to (struct objc_protocol *). */ - if (protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol->class_pointer != objc_lookUpClass ("Protocol")) return NO; objc_mutex_lock (__objc_runtime_mutex); @@ -174,7 +174,7 @@ class_conformsToProtocol (Class class_, Protocol *protocol) /* Check that it is a Protocol object before casting it to (struct objc_protocol *). */ - if (protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol->class_pointer != objc_lookUpClass ("Protocol")) return NO; /* Acquire the runtime lock because the list of protocols for a @@ -278,7 +278,7 @@ protocol_conformsToProtocol (Protocol *protocol, Protocol *anotherProtocol) if (protocol->class_pointer != anotherProtocol->class_pointer) return NO; - if (protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol->class_pointer != objc_lookUpClass ("Protocol")) return NO; if (strcmp (((struct objc_protocol *)protocol)->protocol_name, @@ -317,7 +317,7 @@ protocol_isEqual (Protocol *protocol, Protocol *anotherProtocol) if (protocol->class_pointer != anotherProtocol->class_pointer) return NO; - if (protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol->class_pointer != objc_lookUpClass ("Protocol")) return NO; /* Equality between formal protocols is only formal (nothing to do @@ -346,7 +346,7 @@ protocol_getName (Protocol *protocol) { /* Check that it is a Protocol object before casting it to (struct objc_protocol *). */ - if (protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol->class_pointer != objc_lookUpClass ("Protocol")) return NULL; return ((struct objc_protocol *)protocol)->protocol_name; @@ -368,7 +368,7 @@ struct objc_method_description protocol_getMethodDescription (Protocol *protocol /* Check that it is a Protocol object before casting it to (struct objc_protocol *). */ - if (protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol->class_pointer != objc_lookUpClass ("Protocol")) return no_result; if (instanceMethod) @@ -413,7 +413,7 @@ struct objc_method_description *protocol_copyMethodDescriptionList (Protocol *pr /* Check that it is a Protocol object before casting it to (struct objc_protocol *). */ - if (protocol == NULL || protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol == NULL || protocol->class_pointer != objc_lookUpClass ("Protocol")) { if (numberOfReturnedMethods) *numberOfReturnedMethods = 0; @@ -464,7 +464,7 @@ Property protocol_getProperty (Protocol *protocol, const char *propertyName, /* Check that it is a Protocol object before casting it to (struct objc_protocol *). */ - if (protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol->class_pointer != objc_lookUpClass ("Protocol")) return NULL; /* TODO: New ABI. */ @@ -479,7 +479,7 @@ Property *protocol_copyPropertyList (Protocol *protocol, unsigned int *numberOfR /* Check that it is a Protocol object before casting it to (struct objc_protocol *). */ - if (protocol == NULL || protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol == NULL || protocol->class_pointer != objc_lookUpClass ("Protocol")) { if (numberOfReturnedProperties) *numberOfReturnedProperties = 0; @@ -506,7 +506,7 @@ Protocol **protocol_copyProtocolList (Protocol *protocol, unsigned int *numberOf /* Check that it is a Protocol object before casting it to (struct objc_protocol *). */ - if (protocol == NULL || protocol->class_pointer != objc_lookupClass ("Protocol")) + if (protocol == NULL || protocol->class_pointer != objc_lookUpClass ("Protocol")) { if (numberOfReturnedProtocols) *numberOfReturnedProtocols = 0; diff --git a/libobjc/sendmsg.c b/libobjc/sendmsg.c index 5f430fd..2fb716c 100644 --- a/libobjc/sendmsg.c +++ b/libobjc/sendmsg.c @@ -228,9 +228,6 @@ __objc_resolve_instance_method (Class class, SEL sel) return NULL; } -/* Temporary definition until we include objc/runtime.h. */ -objc_EXPORT Class objc_lookupClass (const char *name); - /* Given a class and selector, return the selector's implementation. */ inline @@ -292,7 +289,7 @@ get_imp (Class class, SEL sel) need to obtain the class from the meta class, which we do using the fact that both the class and the meta-class have the same name. */ - Class realClass = objc_lookupClass (class->name); + Class realClass = objc_lookUpClass (class->name); if (realClass) res = __objc_resolve_class_method (realClass, sel); } -- cgit v1.1