gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

update function to new api

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29794 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2010-02-28 11:17:49 +00:00
parent c01d7213e5
commit 9d86214934
1 changed files with 42 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Source/Additions/GSObjCRuntime.m
View file

@ -131,31 +131,20 @@ GSNameFromSelector(SEL sel)
SEL SEL
GSSelectorFromName(const char *name) GSSelectorFromName(const char *name)
{ {
if (name == 0) return sel_getUid(name);
{
return 0;
}
else
{
#if NeXT_RUNTIME
return sel_getUid(name);
#else
return sel_get_any_uid(name); // return 0 if not found
#endif
}
} }
SEL SEL
GSSelectorFromNameAndTypes(const char *name, const char *types) GSSelectorFromNameAndTypes(const char *name, const char *types)
{ {
#if NeXT_RUNTIME
return sel_getUid(name);
#else
if (name == 0) if (name == 0)
{ {
return 0; return 0;
} }
else else
{ {
#if NeXT_RUNTIME
return sel_getUid(name);
#else
SEL s; SEL s;
if (types == 0) if (types == 0)
@ -178,8 +167,8 @@ GSSelectorFromNameAndTypes(const char *name, const char *types)
} }
} }
return s; return s;
#endif
} }
#endif
} }
const char * const char *
GSTypesFromSelector(SEL sel) GSTypesFromSelector(SEL sel)
@ -218,14 +207,46 @@ GSObjCVersion(Class cls)
*/ */
BOOL BOOL
GSObjCFindVariable(id obj, const char *name, GSObjCFindVariable(id obj, const char *name,
const char **type, unsigned int *size, int *offset) const char **type, unsigned int *size, int *offset)
{ {
Class class; Class class = object_getClass(obj);
#if 1
Ivar ivar = 0;
while (class != 0 && ivar == 0)
{
ivar = class_getInstanceVariable(class, name);
if (ivar == 0)
{
class = class_getSuperclass(class);
}
}
if (ivar == 0)
{
return NO;
}
else
{
const char *enc = ivar_getTypeEncoding(ivar);
if (type != 0)
{
*type = enc;
}
if (size != 0)
{
*size = objc_sizeof_type(enc);
}
if (offset != 0)
{
*offset = ivar_getOffset(ivar);
}
return YES;
}
#else /* OBSOLETE */
struct objc_ivar_list *ivars; struct objc_ivar_list *ivars;
struct objc_ivar *ivar = 0; struct objc_ivar *ivar = 0;
if (obj == nil) return NO;
class = GSObjCClass(obj);
while (class != nil && ivar == 0) while (class != nil && ivar == 0)
{ {
ivars = class->ivars; ivars = class->ivars;
@ -256,6 +277,7 @@ GSObjCFindVariable(id obj, const char *name,
if (offset) if (offset)
*offset = ivar->ivar_offset; *offset = ivar->ivar_offset;
return YES; return YES;
#endif
} }
/** /**