gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various small bugfixes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3138 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1998-10-28 13:58:05 +00:00
parent 766b053b50
commit ba0837b92b
5 changed files with 347 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Headers/gnustep/base/NSInvocation.h
View file

@ -38,6 +38,7 @@
int numArgs; int numArgs;
NSArgumentInfo *info; NSArgumentInfo *info;
BOOL argsRetained; BOOL argsRetained;
BOOL validReturn;
} }
/* /*

9
Source/NSArchiver.m
View file

@ -162,7 +162,8 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
} }
NS_HANDLER NS_HANDLER
{ {
d = nil; [archiver release];
[localException raise];
} }
NS_ENDHANDLER NS_ENDHANDLER
[archiver release]; [archiver release];
@ -280,10 +281,7 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
(*tagImp)(dst, tagSel, _C_STRUCT_B); (*tagImp)(dst, tagSel, _C_STRUCT_B);
} }
while (*type != _C_STRUCT_E && *type != '=') while (*type != _C_STRUCT_E && *type++ != '='); /* skip "<name>=" */
{
type++;
}
for (;;) for (;;)
{ {
@ -355,6 +353,7 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
node->value.I = ++xRefP; node->value.I = ++xRefP;
} }
(*tagImp)(dst, tagSel, _C_PTR); (*tagImp)(dst, tagSel, _C_PTR);
(*xRefImp)(dst, xRefSel, node->value.I);
type++; type++;
buf = *(char**)buf; buf = *(char**)buf;
(*eValImp)(self, eValSel, type, buf); (*eValImp)(self, eValSel, type, buf);

10
Source/NSData.m
View file

@ -801,13 +801,13 @@ failure:
[self deserializeBytes: types [self deserializeBytes: types
length: lt length: lt
atCursor: cursor]; atCursor: cursor];
name[lt] = '\0'; types[lt] = '\0';
if (lt) { if (lt) {
sel = sel_get_typed_uid(name, types); sel = sel_get_typed_uid(name, types);
} }
else { else {
sel = sel_get_uid(name); sel = sel_get_any_typed_uid(name);
} }
if (sel == 0) { if (sel == 0) {
[NSException raise: NSInternalInconsistencyException [NSException raise: NSInternalInconsistencyException
@ -1684,13 +1684,13 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
getBytes((void*)name, bytes, ln, length, cursor); getBytes((void*)name, bytes, ln, length, cursor);
name[ln] = '\0'; name[ln] = '\0';
getBytes((void*)types, bytes, lt, length, cursor); getBytes((void*)types, bytes, lt, length, cursor);
name[lt] = '\0'; types[lt] = '\0';
if (lt) { if (lt) {
sel = sel_get_typed_uid(name, types); sel = sel_get_typed_uid(name, types);
} }
else { else {
sel = sel_get_uid(name); sel = sel_get_any_typed_uid(name);
} }
if (sel == 0) { if (sel == 0) {
[NSException raise: NSInternalInconsistencyException [NSException raise: NSInternalInconsistencyException
@ -2448,7 +2448,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
length += ln; length += ln;
} }
if (lt) { if (lt) {
memcpy(bytes+length, type, lt); memcpy(bytes+length, types, lt);
length += lt; length += lt;
} }
return; return;

582
Source/NSInvocation.m
View file

@ -32,42 +32,49 @@
+ (NSInvocation*) invocationWithMethodSignature: (NSMethodSignature*)signature + (NSInvocation*) invocationWithMethodSignature: (NSMethodSignature*)signature
{ {
return [[[NSInvocation alloc] initWithMethodSignature: signature] return [[[NSInvocation alloc] initWithMethodSignature: signature]
autorelease]; autorelease];
} }
- (void) dealloc - (void) dealloc
{ {
if (argsRetained) { if (argsRetained)
[target release]; {
argsRetained = NO; [target release];
if (argframe && sig) { argsRetained = NO;
int i; if (argframe && sig)
{
int i;
for (i = 3; i <= numArgs; i++) { for (i = 3; i <= numArgs; i++)
if (*info[i].type == _C_CHARPTR) { {
char *str; if (*info[i].type == _C_CHARPTR)
{
char *str;
mframe_get_arg(argframe, &info[i], &str); mframe_get_arg(argframe, &info[i], &str);
objc_free(str); objc_free(str);
} }
else if (*info[i].type == _C_ID) { else if (*info[i].type == _C_ID)
id obj; {
id obj;
mframe_get_arg(argframe, &info[i], &obj); mframe_get_arg(argframe, &info[i], &obj);
[obj release]; [obj release];
} }
} }
} }
} }
if (argframe) { if (argframe)
mframe_destroy_argframe([sig methodType], argframe); {
mframe_destroy_argframe([sig methodType], argframe);
} }
if (retval) { if (retval)
objc_free(retval); {
objc_free(retval);
} }
[sig release]; [sig release];
[super dealloc]; [super dealloc];
} }
/* /*
@ -77,130 +84,156 @@
- (void) getArgument: (void*)buffer - (void) getArgument: (void*)buffer
atIndex: (int)index atIndex: (int)index
{ {
if ((unsigned)index >= numArgs) { if ((unsigned)index >= numArgs)
[NSException raise: NSInvalidArgumentException {
format: @"bad invocation argument index"]; [NSException raise: NSInvalidArgumentException
format: @"bad invocation argument index"];
} }
if (index == 0) { if (index == 0)
*(id*)buffer = target; {
*(id*)buffer = target;
} }
else if (index == 1) { else if (index == 1)
*(SEL*)buffer = selector; {
*(SEL*)buffer = selector;
} }
else { else
index++; /* Allow offset for return type info. */ {
mframe_get_arg(argframe, &info[index], buffer); index++; /* Allow offset for return type info. */
mframe_get_arg(argframe, &info[index], buffer);
} }
} }
- (void) getReturnValue: (void*)buffer - (void) getReturnValue: (void*)buffer
{ {
const char *type; const char *type;
type = [sig methodReturnType]; if (validReturn == NO)
{
[NSException raise: NSGenericException
format: @"getReturnValue with no value set"];
}
if (*info[0].type != _C_VOID) { type = [sig methodReturnType];
int length = info[0].size;
if (*info[0].type != _C_VOID)
{
int length = info[0].size;
#if WORDS_BIGENDIAN #if WORDS_BIGENDIAN
if (length < sizeof(void*)) if (length < sizeof(void*))
length = sizeof(void*); length = sizeof(void*);
#endif #endif
memcpy(buffer, retval, length); memcpy(buffer, retval, length);
} }
} }
- (SEL) selector - (SEL) selector
{ {
return selector; return selector;
} }
- (void) setArgument: (void*)buffer - (void) setArgument: (void*)buffer
atIndex: (int)index atIndex: (int)index
{ {
if ((unsigned)index >= numArgs) { if ((unsigned)index >= numArgs)
[NSException raise: NSInvalidArgumentException {
format: @"bad invocation argument index"]; [NSException raise: NSInvalidArgumentException
format: @"bad invocation argument index"];
} }
if (index == 0) { if (index == 0)
[self setTarget: *(id*)buffer]; {
[self setTarget: *(id*)buffer];
} }
else if (index == 1) { else if (index == 1)
[self setSelector: *(SEL*)buffer]; {
[self setSelector: *(SEL*)buffer];
} }
else { else
int i = index+1; /* Allow for return type in 'info' */ {
const char *type = info[i].type; int i = index+1; /* Allow for return type in 'info' */
const char *type = info[i].type;
if (argsRetained && (*type == _C_ID || *type == _C_CHARPTR)) { if (argsRetained && (*type == _C_ID || *type == _C_CHARPTR))
if (*type == _C_ID) { {
id old; if (*type == _C_ID)
{
id old;
mframe_get_arg(argframe, &info[i], &old); mframe_get_arg(argframe, &info[i], &old);
mframe_set_arg(argframe, &info[i], buffer); mframe_set_arg(argframe, &info[i], buffer);
[*(id*)buffer retain]; [*(id*)buffer retain];
if (old != nil) { if (old != nil)
[old release]; {
[old release];
} }
} }
else { else
char *oldstr; {
char *newstr = *(char**)buffer; char *oldstr;
char *newstr = *(char**)buffer;
mframe_get_arg(argframe, &info[i], &oldstr); mframe_get_arg(argframe, &info[i], &oldstr);
if (newstr == 0) { if (newstr == 0)
mframe_set_arg(argframe, &info[i], buffer); {
mframe_set_arg(argframe, &info[i], buffer);
} }
else { else
char *tmp = objc_malloc(strlen(newstr)+1); {
char *tmp = objc_malloc(strlen(newstr)+1);
strcpy(tmp, newstr); strcpy(tmp, newstr);
mframe_set_arg(argframe, &info[i], tmp); mframe_set_arg(argframe, &info[i], tmp);
} }
if (oldstr != 0) { if (oldstr != 0)
objc_free(oldstr); {
objc_free(oldstr);
} }
} }
} }
else { else
mframe_set_arg(argframe, &info[i], buffer); {
mframe_set_arg(argframe, &info[i], buffer);
} }
} }
} }
- (void) setReturnValue: (void*)buffer - (void) setReturnValue: (void*)buffer
{ {
const char *type; const char *type;
type = info[0].type; type = info[0].type;
if (*type != _C_VOID) { if (*type != _C_VOID)
int length = info[0].size; {
int length = info[0].size;
#if WORDS_BIGENDIAN #if WORDS_BIGENDIAN
if (length < sizeof(void*)) if (length < sizeof(void*))
length = sizeof(void*); length = sizeof(void*);
#endif #endif
memcpy(retval, buffer, length); memcpy(retval, buffer, length);
} }
validReturn = YES;
} }
- (void) setSelector: (SEL)aSelector - (void) setSelector: (SEL)aSelector
{ {
selector = aSelector; selector = aSelector;
} }
- (void) setTarget: (id)anObject - (void) setTarget: (id)anObject
{ {
if (argsRetained) { if (argsRetained)
[anObject retain]; {
[target release]; [anObject retain];
[target release];
} }
target = anObject; target = anObject;
} }
- (id) target - (id) target
{ {
return target; return target;
} }
/* /*
@ -209,41 +242,50 @@
- (BOOL) argumentsRetained - (BOOL) argumentsRetained
{ {
return argsRetained; return argsRetained;
} }
- (void)retainArguments - (void)retainArguments
{ {
if (argsRetained) { if (argsRetained)
return; {
return;
} }
else { else
int i; {
int i;
argsRetained = YES; argsRetained = YES;
[target retain]; [target retain];
if (argframe == 0) { if (argframe == 0)
return; {
return;
} }
for (i = 3; i <= numArgs; i++) { for (i = 3; i <= numArgs; i++)
if (*info[i].type == _C_ID || *info[i].type == _C_CHARPTR) { {
if (*info[i].type == _C_ID) { if (*info[i].type == _C_ID || *info[i].type == _C_CHARPTR)
id old; {
if (*info[i].type == _C_ID)
{
id old;
mframe_get_arg(argframe, &info[i], &old); mframe_get_arg(argframe, &info[i], &old);
if (old != nil) { if (old != nil)
[old retain]; {
[old retain];
} }
} }
else { else
char *str; {
char *str;
mframe_get_arg(argframe, &info[i], &str); mframe_get_arg(argframe, &info[i], &str);
if (str != 0) { if (str != 0)
char *tmp = objc_malloc(strlen(str)+1); {
char *tmp = objc_malloc(strlen(str)+1);
strcpy(tmp, str); strcpy(tmp, str);
mframe_set_arg(argframe, &info[i], &tmp); mframe_set_arg(argframe, &info[i], &tmp);
} }
} }
} }
@ -257,57 +299,60 @@
- (void) invoke - (void) invoke
{ {
[self invokeWithTarget: target]; [self invokeWithTarget: target];
} }
- (void) invokeWithTarget:(id)anObject - (void) invokeWithTarget:(id)anObject
{ {
id old_target; id old_target;
retval_t returned; retval_t returned;
IMP imp; IMP imp;
int stack_argsize; int stack_argsize;
/* /*
* A message to a nil object returns nil. * A message to a nil object returns nil.
*/ */
if (anObject == nil) { if (anObject == nil)
memset(retval, '\0', info[0].size); /* Clear return value */ {
return; memset(retval, '\0', info[0].size); /* Clear return value */
return;
} }
NSAssert(selector != 0, @"you must set the selector before invoking"); NSAssert(selector != 0, @"you must set the selector before invoking");
/* /*
* Temporarily set new target and copy it (and the selector) into the * Temporarily set new target and copy it (and the selector) into the
* argframe. * argframe.
*/ */
old_target = [target retain]; old_target = [target retain];
[self setTarget: anObject]; [self setTarget: anObject];
mframe_set_arg(argframe, &info[1], &target); mframe_set_arg(argframe, &info[1], &target);
mframe_set_arg(argframe, &info[2], &selector); mframe_set_arg(argframe, &info[2], &selector);
imp = method_get_imp(object_is_instance(target) ? imp = method_get_imp(object_is_instance(target) ?
class_get_instance_method( class_get_instance_method(
((struct objc_class*)target)->class_pointer, selector) ((struct objc_class*)target)->class_pointer, selector)
: class_get_class_method( : class_get_class_method(
((struct objc_class*)target)->class_pointer, selector)); ((struct objc_class*)target)->class_pointer, selector));
/* /*
* If fast lookup failed, we may be forwarding or something ... * If fast lookup failed, we may be forwarding or something ...
*/ */
if (imp == 0) if (imp == 0)
imp = objc_msg_lookup(target, selector); imp = objc_msg_lookup(target, selector);
[self setTarget: old_target]; [self setTarget: old_target];
[old_target release]; [old_target release];
stack_argsize = [sig frameLength]; stack_argsize = [sig frameLength];
returned = __builtin_apply((void(*)(void))imp, argframe, stack_argsize); returned = __builtin_apply((void(*)(void))imp, argframe, stack_argsize);
if (info[0].size) { if (info[0].size)
mframe_decode_return(info[0].type, retval, returned); {
mframe_decode_return(info[0].type, retval, returned);
} }
validReturn = YES;
} }
/* /*
@ -316,74 +361,96 @@
- (NSMethodSignature*) methodSignature - (NSMethodSignature*) methodSignature
{ {
return sig; return sig;
} }
- (NSString*)description - (NSString*)description
{ {
/* Don't use -[NSString stringWithFormat:] method because it can cause /*
infinite recursion. */ * Don't use -[NSString stringWithFormat:] method because it can cause
char buffer[1024]; * infinite recursion.
*/
char buffer[1024];
sprintf (buffer, "<%s %p selector: %s target: %s>", \ sprintf (buffer, "<%s %p selector: %s target: %s>", \
(char*)object_get_class_name(self), \ (char*)object_get_class_name(self), \
self, \ self, \
selector ? [NSStringFromSelector(selector) cString] : "nil", \ selector ? [NSStringFromSelector(selector) cString] : "nil", \
target ? [NSStringFromClass([target class]) cString] : "nil" \ target ? [NSStringFromClass([target class]) cString] : "nil" \
); );
return [NSString stringWithCString:buffer]; return [NSString stringWithCString:buffer];
} }
- (void) encodeWithCoder: (NSCoder*)aCoder - (void) encodeWithCoder: (NSCoder*)aCoder
{ {
const char *types = [sig methodType]; const char *types = [sig methodType];
int i; int i;
[aCoder encodeValueOfObjCType: @encode(char*) [aCoder encodeValueOfObjCType: @encode(char*)
at: &types at: &types];
withName: @"invocation types"];
[aCoder encodeBycopyObject: target [aCoder encodeObject: target];
withName: @"target"];
[aCoder encodeValueOfObjCType: info[2].type [aCoder encodeValueOfObjCType: info[2].type
at: &selector at: &selector];
withName: @"selector"];
for (i = 3; i <= numArgs; i++) { for (i = 3; i <= numArgs; i++)
const char *type = info[i].type; {
void *datum; const char *type = info[i].type;
void *datum;
datum = mframe_arg_addr(argframe, &info[i]); datum = mframe_arg_addr(argframe, &info[i]);
if (*type == _C_ID) if (*type == _C_ID)
[aCoder encodeBycopyObject: *(id*)datum withName: @"arg"]; {
else [aCoder encodeObject: *(id*)datum];
[aCoder encodeValueOfObjCType: type at: datum withName: @"arg"]; }
else
{
[aCoder encodeValueOfObjCType: type at: datum];
}
}
if (*info[0].type != _C_VOID)
{
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &validReturn];
if (validReturn)
{
[aCoder encodeValueOfObjCType: info[0].type at: retval];
}
} }
} }
- (id) initWithCoder: (NSCoder*)aCoder - (id) initWithCoder: (NSCoder*)aCoder
{ {
NSMethodSignature *newSig; NSMethodSignature *newSig;
const char *types; const char *types;
void *datum; void *datum;
int i; int i;
[aCoder decodeValueOfObjCType: @encode(char*) at: &types]; [aCoder decodeValueOfObjCType: @encode(char*) at: &types];
newSig = [NSMethodSignature signatureWithObjCTypes: types]; newSig = [NSMethodSignature signatureWithObjCTypes: types];
self = [self initWithMethodSignature: newSig]; self = [self initWithMethodSignature: newSig];
[aCoder decodeValueOfObjCType: @encode(id) at: &target]; [aCoder decodeValueOfObjCType: @encode(id) at: &target];
[aCoder decodeValueOfObjCType: @encode(SEL) at: &selector]; [aCoder decodeValueOfObjCType: @encode(SEL) at: &selector];
for (i = 3; i <= numArgs; i++) { for (i = 3; i <= numArgs; i++)
datum = mframe_arg_addr(argframe, &info[i]); {
[aCoder decodeValueOfObjCType: info[i].type at: datum]; datum = mframe_arg_addr(argframe, &info[i]);
[aCoder decodeValueOfObjCType: info[i].type at: datum];
} }
argsRetained = YES; argsRetained = YES;
if (*info[0].type != _C_VOID)
{
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &validReturn];
if (validReturn)
{
[aCoder decodeValueOfObjCType: info[0].type at: retval];
}
}
return self;
} }
@ -394,35 +461,40 @@
- initWithArgframe: (arglist_t)frame selector: (SEL)aSelector - initWithArgframe: (arglist_t)frame selector: (SEL)aSelector
{ {
const char *types; const char *types;
NSMethodSignature *newSig; NSMethodSignature *newSig;
types = sel_get_type(aSelector); types = sel_get_type(aSelector);
if (types == 0) { if (types == 0)
types = sel_get_type(sel_get_any_typed_uid(sel_get_name(aSelector))); {
types = sel_get_type(sel_get_any_typed_uid(sel_get_name(aSelector)));
} }
if (types == 0) { if (types == 0)
[NSException raise: NSInvalidArgumentException {
format: @"Couldn't find encoding type for selector %s.", [NSException raise: NSInvalidArgumentException
format: @"Couldn't find encoding type for selector %s.",
sel_get_name(aSelector)]; sel_get_name(aSelector)];
} }
newSig = [NSMethodSignature signatureWithObjCTypes: types]; newSig = [NSMethodSignature signatureWithObjCTypes: types];
self = [self initWithMethodSignature: newSig]; self = [self initWithMethodSignature: newSig];
if (self) { if (self)
[self setSelector: aSelector]; {
/* [self setSelector: aSelector];
* Copy the argframe we were given. /*
*/ * Copy the argframe we were given.
if (frame) { */
int i; if (frame)
{
int i;
mframe_get_arg(frame, &info[1], &target); mframe_get_arg(frame, &info[1], &target);
for (i = 1; i <= numArgs; i++) { for (i = 1; i <= numArgs; i++)
mframe_cpy_arg(argframe, frame, &info[i]); {
mframe_cpy_arg(argframe, frame, &info[i]);
} }
} }
} }
return self; return self;
} }
/* /*
@ -430,84 +502,92 @@
*/ */
- initWithMethodSignature: (NSMethodSignature*)aSignature - initWithMethodSignature: (NSMethodSignature*)aSignature
{ {
sig = [aSignature retain]; sig = [aSignature retain];
numArgs = [aSignature numberOfArguments]; numArgs = [aSignature numberOfArguments];
info = [aSignature methodInfo]; info = [aSignature methodInfo];
argframe = mframe_create_argframe([sig methodType], &retval); argframe = mframe_create_argframe([sig methodType], &retval);
if (retval == 0 && info[0].size > 0) { if (retval == 0 && info[0].size > 0)
retval = objc_malloc(info[0].size); {
retval = objc_malloc(info[0].size);
} }
return self; return self;
} }
- initWithSelector: (SEL)aSelector - initWithSelector: (SEL)aSelector
{ {
return [self initWithArgframe: 0 selector: aSelector]; return [self initWithArgframe: 0 selector: aSelector];
} }
- initWithTarget: anObject selector: (SEL)aSelector, ... - initWithTarget: anObject selector: (SEL)aSelector, ...
{ {
va_list ap; va_list ap;
self = [self initWithArgframe: 0 selector: aSelector]; self = [self initWithArgframe: 0 selector: aSelector];
if (self) { if (self)
int i; {
int i;
[self setTarget: anObject]; [self setTarget: anObject];
va_start (ap, aSelector); va_start (ap, aSelector);
for (i = 3; i <= numArgs; i++) { for (i = 3; i <= numArgs; i++)
const char *type = info[i].type; {
unsigned size = info[i].size; const char *type = info[i].type;
void *datum; unsigned size = info[i].size;
void *datum;
datum = mframe_arg_addr(argframe, &info[i]); datum = mframe_arg_addr(argframe, &info[i]);
#define CASE_TYPE(_C,_T) case _C: *(_T*)datum = va_arg (ap, _T); break #define CASE_TYPE(_C,_T) case _C: *(_T*)datum = va_arg (ap, _T); break
switch (*type) { switch (*type)
case _C_ID: {
*(id*)datum = va_arg (ap, id); case _C_ID:
if (argsRetained) *(id*)datum = va_arg (ap, id);
[*(id*)datum retain]; if (argsRetained)
break; {
case _C_CHARPTR: [*(id*)datum retain];
*(char**)datum = va_arg (ap, char*); }
if (argsRetained) { break;
char *old = *(char**)datum; case _C_CHARPTR:
*(char**)datum = va_arg (ap, char*);
if (argsRetained)
{
char *old = *(char**)datum;
if (old != 0) { if (old != 0)
char *tmp = objc_malloc(strlen(old)+1); {
char *tmp = objc_malloc(strlen(old)+1);
strcpy(tmp, old); strcpy(tmp, old);
*(char**)datum = tmp; *(char**)datum = tmp;
} }
} }
break; break;
CASE_TYPE(_C_CLASS, Class); CASE_TYPE(_C_CLASS, Class);
CASE_TYPE(_C_SEL, SEL); CASE_TYPE(_C_SEL, SEL);
CASE_TYPE(_C_LNG, long); CASE_TYPE(_C_LNG, long);
CASE_TYPE(_C_ULNG, unsigned long); CASE_TYPE(_C_ULNG, unsigned long);
CASE_TYPE(_C_INT, int); CASE_TYPE(_C_INT, int);
CASE_TYPE(_C_UINT, unsigned int); CASE_TYPE(_C_UINT, unsigned int);
CASE_TYPE(_C_SHT, short); CASE_TYPE(_C_SHT, short);
CASE_TYPE(_C_USHT, unsigned short); CASE_TYPE(_C_USHT, unsigned short);
CASE_TYPE(_C_CHR, char); CASE_TYPE(_C_CHR, char);
CASE_TYPE(_C_UCHR, unsigned char); CASE_TYPE(_C_UCHR, unsigned char);
CASE_TYPE(_C_FLT, float); CASE_TYPE(_C_FLT, float);
CASE_TYPE(_C_DBL, double); CASE_TYPE(_C_DBL, double);
CASE_TYPE(_C_PTR, void*); CASE_TYPE(_C_PTR, void*);
default: default:
{ {
memcpy(datum, va_arg(ap, typeof(char[size])), size); memcpy(datum, va_arg(ap, typeof(char[size])), size);
} /* default */ } /* default */
} }
} }
} }
return self; return self;
} }
- (void*) returnFrame: (arglist_t)argFrame - (void*) returnFrame: (arglist_t)argFrame
{ {
return mframe_handle_return(info[0].type, retval, argFrame); return mframe_handle_return(info[0].type, retval, argFrame);
} }
@end @end
@ -515,7 +595,7 @@
- (void) invokeWithObject: (id)obj - (void) invokeWithObject: (id)obj
{ {
[self invokeWithTarget: (id)obj]; [self invokeWithTarget: (id)obj];
} }
@end @end

13
Source/NSUnarchiver.m
View file

@ -283,7 +283,8 @@ static IMP rDatImp; /* To autorelease it. */
} }
NS_HANDLER NS_HANDLER
{ {
obj = nil; [unarchiver release];
[localException raise];
} }
NS_ENDHANDLER NS_ENDHANDLER
[unarchiver release]; [unarchiver release];
@ -639,10 +640,7 @@ static IMP rDatImp; /* To autorelease it. */
int offset = 0; int offset = 0;
typeCheck(*type, _C_STRUCT_B); typeCheck(*type, _C_STRUCT_B);
while (*type != _C_STRUCT_E && *type != '=') while (*type != _C_STRUCT_E && *type++ != '='); /* skip "<name>=" */
{
type++;
}
for (;;) for (;;)
{ {
(*dValImp)(self, dValSel, type, (char*)address + offset); (*dValImp)(self, dValSel, type, (char*)address + offset);
@ -700,16 +698,17 @@ static IMP rDatImp; /* To autorelease it. */
} }
/* /*
* Allocate memory for object to be decoded into. * Allocate memory for object to be decoded into and
* add it to the crossref map.
*/ */
size = objc_sizeof_type(++type); size = objc_sizeof_type(++type);
*(void**)address = NSZoneMalloc(zone, size); *(void**)address = NSZoneMalloc(zone, size);
arrayAddItem(ptrMap, *(void**)address);
/* /*
* Decode value and add memory to map for crossrefs. * Decode value and add memory to map for crossrefs.
*/ */
(*dValImp)(self, dValSel, type, *(void**)address); (*dValImp)(self, dValSel, type, *(void**)address);
arrayAddItem(ptrMap, *(void**)address);
/* /*
* Allocate, initialise, and autorelease an NSData * Allocate, initialise, and autorelease an NSData