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

Tidied

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8220 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-11-28 09:29:21 +00:00
parent 50126f616f
commit 744b14d815
3 changed files with 64 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

100
Source/NSObject.m
View file

@ -1281,90 +1281,6 @@ static BOOL deallocNotifications = NO;
#include <Foundation/NSNull.h>
static BOOL
GSGetValue(id obj, NSString *iVarName, id *data)
{
const char *name = [iVarName cString];
Class class;
struct objc_ivar_list *ivars;
struct objc_ivar *ivar = 0;
int offset;
const char *type;
unsigned int size;
class = [obj class];
while (class != nil && ivar == 0)
{
ivars = class->ivars;
class = class->super_class;
if (ivars != 0)
{
int i;
for (i = 0; i < ivars->ivar_count; i++)
{
if (strcmp(ivars->ivar_list[i].ivar_name, name) == 0)
{
ivar = &ivars->ivar_list[i];
break;
}
}
}
}
if (ivar == 0)
{
return NO;
}
offset = ivar->ivar_offset;
type = ivar->ivar_type;
size = objc_sizeof_type(type);
memcpy(data, ((void*)obj) + offset, size);
return YES;
}
static BOOL
GSSetValue(id obj, NSString *iVarName, id *data)
{
const char *name = [iVarName cString];
Class class;
struct objc_ivar_list *ivars;
struct objc_ivar *ivar = 0;
int offset;
const char *type;
unsigned int size;
class = [obj class];
while (class != nil && ivar == 0)
{
ivars = class->ivars;
class = class->super_class;
if (ivars != 0)
{
int i;
for (i = 0; i < ivars->ivar_count; i++)
{
if (strcmp(ivars->ivar_list[i].ivar_name, name) == 0)
{
ivar = &ivars->ivar_list[i];
break;
}
}
}
}
if (ivar == 0)
{
return NO;
}
offset = ivar->ivar_offset;
type = ivar->ivar_type;
size = objc_sizeof_type(type);
memcpy(((void*)obj) + offset, data, size);
return YES;
}
@implementation NSObject (KeyValueCoding)
+ (BOOL) accessInstanceVariablesDirectly
@ -1413,12 +1329,12 @@ GSSetValue(id obj, NSString *iVarName, id *data)
{
id v;
if (GSGetValue(self, [NSString stringWithFormat: @"_%@", aKey],
if (GSGetInstanceVariable(self, [NSString stringWithFormat: @"_%@", aKey],
(void*)&v) == YES)
{
return v;
}
if (GSGetValue(self, aKey, (void*)&v) == YES)
if (GSGetInstanceVariable(self, aKey, (void*)&v) == YES)
{
return v;
}
@ -1460,12 +1376,12 @@ GSSetValue(id obj, NSString *iVarName, id *data)
if ([[self class] accessInstanceVariablesDirectly] == YES)
{
if (GSSetValue(self, [NSString stringWithFormat: @"_%@", aKey],
if (GSSetInstanceVariable(self, [NSString stringWithFormat: @"_%@", aKey],
(void*)&anObject) == YES)
{
return;
}
if (GSSetValue(self, aKey, (void*)&anObject) == YES)
if (GSSetInstanceVariable(self, aKey, (void*)&anObject) == YES)
{
return;
}
@ -1504,12 +1420,12 @@ GSSetValue(id obj, NSString *iVarName, id *data)
if ([[self class] accessInstanceVariablesDirectly] == YES)
{
if (GSSetValue(self, [NSString stringWithFormat: @"_%@", aKey],
if (GSSetInstanceVariable(self, [NSString stringWithFormat: @"_%@", aKey],
(void*)&anObject) == YES)
{
return;
}
if (GSSetValue(self, aKey, (void*)&anObject) == YES)
if (GSSetInstanceVariable(self, aKey, (void*)&anObject) == YES)
{
return;
}
@ -1591,12 +1507,12 @@ GSSetValue(id obj, NSString *iVarName, id *data)
{
id v;
if (GSGetValue(self, [NSString stringWithFormat: @"_%@", aKey],
if (GSGetInstanceVariable(self, [NSString stringWithFormat: @"_%@", aKey],
(void*)&v) == YES)
{
return v;
}
if (GSGetValue(self, aKey, (void*)&v) == YES)
if (GSGetInstanceVariable(self, aKey, (void*)&v) == YES)
{
return v;
}