From bc18535a3e3a9a7f98ca4f86ca67e937bde6a883 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Sun, 10 Oct 2010 23:28:12 +0000 Subject: objc.h: Updated comments. 2010-10-11 Nicola Pero * objc/objc.h: Updated comments. * objc/objc-api.h: (object_copy): Added one argument; use a #define to maintain backwards-compatibility. Moved _objc_object_alloc, _objc_object_copy, _objc_object_dispose and objc_get_uninstalled_dtable into objc/deprecated/objc_get_uninstalled_dtable.h and objc/deprecated/objc_object_alloc.h. Include these files. * objc/deprecated/objc_get_uninstalled_dtable.h: New. * objc/deprecated/objc_object_alloc.h: New. * objc/runtime.h (set_getName): New. (sel_getType): New. (sel_getUid): New. (sel_registerName): New. (sel_registerTypedName): New. (sel_isEqual): New. (class_createInstance): New. (object_copy): New. (object_dispose): New. * objects.c: Do not include tconfig.h. Include gc_typed.h if building the garbage collection version. (__objc_object_alloc): Removed. (__objc_object_copy): Removed. (__objc_object_dispose): Removed. (class_createInstance): New from code in class_create_instance. Cast second argument of GC_malloc_explicitly_typed. Use objc_calloc. Do not call _objc_object_alloc. (class_create_instance): Call class_createInstance. (object_copy): Added extraBytes argument. Do not call _objc_object_copy. (object_dispose): Do not call _objc_object_dispose. * memory.c (objc_free): When using garbage collection, mark the argument as unused. * selector.c (sel_getName): New. (sel_get_name): Call sel_getName. (sel_getType): New. (sel_get_type): Call sel_getType. (sel_registerName): New. (sel_register_name): Call sel_registerName. (sel_registerTypedName): New. (sel_register_typed_name): Call sel_registerTypedName. (sel_getUid): New. (sel_get_uid): Call sel_getUid. From-SVN: r165264 --- libobjc/selector.c | 55 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 12 deletions(-) (limited to 'libobjc/selector.c') diff --git a/libobjc/selector.c b/libobjc/selector.c index 10b7ab63dad..93952fd3834 100644 --- a/libobjc/selector.c +++ b/libobjc/selector.c @@ -287,16 +287,9 @@ sel_get_any_uid (const char *name) return (SEL) l->head; } -/* return selector representing name */ -SEL -sel_get_uid (const char *name) -{ - return sel_register_typed_name (name, 0); -} - /* Get name of selector. If selector is unknown, the empty string "" is returned */ -const char *sel_get_name (SEL selector) +const char *sel_getName (SEL selector) { const char *ret; @@ -310,6 +303,12 @@ const char *sel_get_name (SEL selector) return ret; } +/* Traditional GNU Objective-C Runtime API. */ +const char *sel_get_name (SEL selector) +{ + return sel_getName (selector); +} + BOOL sel_is_mapped (SEL selector) { @@ -317,8 +316,7 @@ sel_is_mapped (SEL selector) return ((idx > 0) && (idx <= __objc_selector_max_index)); } - -const char *sel_get_type (SEL selector) +const char *sel_getType (SEL selector) { if (selector) return selector->sel_types; @@ -326,6 +324,12 @@ const char *sel_get_type (SEL selector) return 0; } +/* Traditional GNU Objective-C Runtime API. */ +const char *sel_get_type (SEL selector) +{ + return sel_getType (selector); +} + /* The uninstalled dispatch table */ extern struct sarray *__objc_uninstalled_dtable; @@ -467,7 +471,7 @@ __sel_register_typed_name (const char *name, const char *types, } SEL -sel_register_name (const char *name) +sel_registerName (const char *name) { SEL ret; @@ -480,8 +484,15 @@ sel_register_name (const char *name) return ret; } +/* Traditional GNU Objective-C Runtime API. */ SEL -sel_register_typed_name (const char *name, const char *type) +sel_register_name (const char *name) +{ + return sel_registerName (name); +} + +SEL +sel_registerTypedName (const char *name, const char *type) { SEL ret; @@ -493,3 +504,23 @@ sel_register_typed_name (const char *name, const char *type) return ret; } + +SEL +sel_register_typed_name (const char *name, const char *type) +{ + return sel_registerTypedName (name, type); +} + +/* return selector representing name */ +SEL +sel_getUid (const char *name) +{ + return sel_registerTypedName (name, 0); +} + +/* Traditional GNU Objective-C Runtime API. */ +SEL +sel_get_uid (const char *name) +{ + return sel_getUid (name); +} -- cgit v1.2.1