mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 09:04:13 +00:00
Various small bugfixes.
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 Frith-MacDonald
parent
179714a31b
commit
d2d5feb8ef
5 changed files with 347 additions and 268 deletions
|
|
@ -38,6 +38,7 @@
|
|||
int numArgs;
|
||||
NSArgumentInfo *info;
|
||||
BOOL argsRetained;
|
||||
BOOL validReturn;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -162,7 +162,8 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
|
|||
}
|
||||
NS_HANDLER
|
||||
{
|
||||
d = nil;
|
||||
[archiver release];
|
||||
[localException raise];
|
||||
}
|
||||
NS_ENDHANDLER
|
||||
[archiver release];
|
||||
|
|
@ -280,10 +281,7 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
|
|||
(*tagImp)(dst, tagSel, _C_STRUCT_B);
|
||||
}
|
||||
|
||||
while (*type != _C_STRUCT_E && *type != '=')
|
||||
{
|
||||
type++;
|
||||
}
|
||||
while (*type != _C_STRUCT_E && *type++ != '='); /* skip "<name>=" */
|
||||
|
||||
for (;;)
|
||||
{
|
||||
|
|
@ -355,6 +353,7 @@ static SEL eValSel = @selector(encodeValueOfObjCType:at:);
|
|||
node->value.I = ++xRefP;
|
||||
}
|
||||
(*tagImp)(dst, tagSel, _C_PTR);
|
||||
(*xRefImp)(dst, xRefSel, node->value.I);
|
||||
type++;
|
||||
buf = *(char**)buf;
|
||||
(*eValImp)(self, eValSel, type, buf);
|
||||
|
|
|
|||
|
|
@ -801,13 +801,13 @@ failure:
|
|||
[self deserializeBytes: types
|
||||
length: lt
|
||||
atCursor: cursor];
|
||||
name[lt] = '\0';
|
||||
types[lt] = '\0';
|
||||
|
||||
if (lt) {
|
||||
sel = sel_get_typed_uid(name, types);
|
||||
}
|
||||
else {
|
||||
sel = sel_get_uid(name);
|
||||
sel = sel_get_any_typed_uid(name);
|
||||
}
|
||||
if (sel == 0) {
|
||||
[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);
|
||||
name[ln] = '\0';
|
||||
getBytes((void*)types, bytes, lt, length, cursor);
|
||||
name[lt] = '\0';
|
||||
types[lt] = '\0';
|
||||
|
||||
if (lt) {
|
||||
sel = sel_get_typed_uid(name, types);
|
||||
}
|
||||
else {
|
||||
sel = sel_get_uid(name);
|
||||
sel = sel_get_any_typed_uid(name);
|
||||
}
|
||||
if (sel == 0) {
|
||||
[NSException raise: NSInternalInconsistencyException
|
||||
|
|
@ -2448,7 +2448,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
|
|||
length += ln;
|
||||
}
|
||||
if (lt) {
|
||||
memcpy(bytes+length, type, lt);
|
||||
memcpy(bytes+length, types, lt);
|
||||
length += lt;
|
||||
}
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -32,42 +32,49 @@
|
|||
|
||||
+ (NSInvocation*) invocationWithMethodSignature: (NSMethodSignature*)signature
|
||||
{
|
||||
return [[[NSInvocation alloc] initWithMethodSignature: signature]
|
||||
return [[[NSInvocation alloc] initWithMethodSignature: signature]
|
||||
autorelease];
|
||||
}
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
if (argsRetained) {
|
||||
[target release];
|
||||
argsRetained = NO;
|
||||
if (argframe && sig) {
|
||||
int i;
|
||||
if (argsRetained)
|
||||
{
|
||||
[target release];
|
||||
argsRetained = NO;
|
||||
if (argframe && sig)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 3; i <= numArgs; i++) {
|
||||
if (*info[i].type == _C_CHARPTR) {
|
||||
char *str;
|
||||
for (i = 3; i <= numArgs; i++)
|
||||
{
|
||||
if (*info[i].type == _C_CHARPTR)
|
||||
{
|
||||
char *str;
|
||||
|
||||
mframe_get_arg(argframe, &info[i], &str);
|
||||
objc_free(str);
|
||||
mframe_get_arg(argframe, &info[i], &str);
|
||||
objc_free(str);
|
||||
}
|
||||
else if (*info[i].type == _C_ID) {
|
||||
id obj;
|
||||
else if (*info[i].type == _C_ID)
|
||||
{
|
||||
id obj;
|
||||
|
||||
mframe_get_arg(argframe, &info[i], &obj);
|
||||
[obj release];
|
||||
mframe_get_arg(argframe, &info[i], &obj);
|
||||
[obj release];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (argframe) {
|
||||
mframe_destroy_argframe([sig methodType], argframe);
|
||||
if (argframe)
|
||||
{
|
||||
mframe_destroy_argframe([sig methodType], argframe);
|
||||
}
|
||||
if (retval) {
|
||||
objc_free(retval);
|
||||
if (retval)
|
||||
{
|
||||
objc_free(retval);
|
||||
}
|
||||
[sig release];
|
||||
[super dealloc];
|
||||
[sig release];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -77,130 +84,156 @@
|
|||
- (void) getArgument: (void*)buffer
|
||||
atIndex: (int)index
|
||||
{
|
||||
if ((unsigned)index >= numArgs) {
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"bad invocation argument index"];
|
||||
if ((unsigned)index >= numArgs)
|
||||
{
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"bad invocation argument index"];
|
||||
}
|
||||
if (index == 0) {
|
||||
*(id*)buffer = target;
|
||||
if (index == 0)
|
||||
{
|
||||
*(id*)buffer = target;
|
||||
}
|
||||
else if (index == 1) {
|
||||
*(SEL*)buffer = selector;
|
||||
else if (index == 1)
|
||||
{
|
||||
*(SEL*)buffer = selector;
|
||||
}
|
||||
else {
|
||||
index++; /* Allow offset for return type info. */
|
||||
mframe_get_arg(argframe, &info[index], buffer);
|
||||
else
|
||||
{
|
||||
index++; /* Allow offset for return type info. */
|
||||
mframe_get_arg(argframe, &info[index], 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) {
|
||||
int length = info[0].size;
|
||||
type = [sig methodReturnType];
|
||||
|
||||
if (*info[0].type != _C_VOID)
|
||||
{
|
||||
int length = info[0].size;
|
||||
#if WORDS_BIGENDIAN
|
||||
if (length < sizeof(void*))
|
||||
length = sizeof(void*);
|
||||
if (length < sizeof(void*))
|
||||
length = sizeof(void*);
|
||||
#endif
|
||||
memcpy(buffer, retval, length);
|
||||
memcpy(buffer, retval, length);
|
||||
}
|
||||
}
|
||||
|
||||
- (SEL) selector
|
||||
{
|
||||
return selector;
|
||||
return selector;
|
||||
}
|
||||
|
||||
- (void) setArgument: (void*)buffer
|
||||
atIndex: (int)index
|
||||
{
|
||||
if ((unsigned)index >= numArgs) {
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"bad invocation argument index"];
|
||||
if ((unsigned)index >= numArgs)
|
||||
{
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"bad invocation argument index"];
|
||||
}
|
||||
if (index == 0) {
|
||||
[self setTarget: *(id*)buffer];
|
||||
if (index == 0)
|
||||
{
|
||||
[self setTarget: *(id*)buffer];
|
||||
}
|
||||
else if (index == 1) {
|
||||
[self setSelector: *(SEL*)buffer];
|
||||
else if (index == 1)
|
||||
{
|
||||
[self setSelector: *(SEL*)buffer];
|
||||
}
|
||||
else {
|
||||
int i = index+1; /* Allow for return type in 'info' */
|
||||
const char *type = info[i].type;
|
||||
else
|
||||
{
|
||||
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 (*type == _C_ID) {
|
||||
id old;
|
||||
if (argsRetained && (*type == _C_ID || *type == _C_CHARPTR))
|
||||
{
|
||||
if (*type == _C_ID)
|
||||
{
|
||||
id old;
|
||||
|
||||
mframe_get_arg(argframe, &info[i], &old);
|
||||
mframe_set_arg(argframe, &info[i], buffer);
|
||||
[*(id*)buffer retain];
|
||||
if (old != nil) {
|
||||
[old release];
|
||||
mframe_get_arg(argframe, &info[i], &old);
|
||||
mframe_set_arg(argframe, &info[i], buffer);
|
||||
[*(id*)buffer retain];
|
||||
if (old != nil)
|
||||
{
|
||||
[old release];
|
||||
}
|
||||
}
|
||||
else {
|
||||
char *oldstr;
|
||||
char *newstr = *(char**)buffer;
|
||||
else
|
||||
{
|
||||
char *oldstr;
|
||||
char *newstr = *(char**)buffer;
|
||||
|
||||
mframe_get_arg(argframe, &info[i], &oldstr);
|
||||
if (newstr == 0) {
|
||||
mframe_set_arg(argframe, &info[i], buffer);
|
||||
mframe_get_arg(argframe, &info[i], &oldstr);
|
||||
if (newstr == 0)
|
||||
{
|
||||
mframe_set_arg(argframe, &info[i], buffer);
|
||||
}
|
||||
else {
|
||||
char *tmp = objc_malloc(strlen(newstr)+1);
|
||||
else
|
||||
{
|
||||
char *tmp = objc_malloc(strlen(newstr)+1);
|
||||
|
||||
strcpy(tmp, newstr);
|
||||
mframe_set_arg(argframe, &info[i], tmp);
|
||||
strcpy(tmp, newstr);
|
||||
mframe_set_arg(argframe, &info[i], tmp);
|
||||
}
|
||||
if (oldstr != 0) {
|
||||
objc_free(oldstr);
|
||||
if (oldstr != 0)
|
||||
{
|
||||
objc_free(oldstr);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
mframe_set_arg(argframe, &info[i], buffer);
|
||||
else
|
||||
{
|
||||
mframe_set_arg(argframe, &info[i], buffer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (void) setReturnValue: (void*)buffer
|
||||
{
|
||||
const char *type;
|
||||
const char *type;
|
||||
|
||||
type = info[0].type;
|
||||
type = info[0].type;
|
||||
|
||||
if (*type != _C_VOID) {
|
||||
int length = info[0].size;
|
||||
if (*type != _C_VOID)
|
||||
{
|
||||
int length = info[0].size;
|
||||
|
||||
#if WORDS_BIGENDIAN
|
||||
if (length < sizeof(void*))
|
||||
length = sizeof(void*);
|
||||
if (length < sizeof(void*))
|
||||
length = sizeof(void*);
|
||||
#endif
|
||||
memcpy(retval, buffer, length);
|
||||
memcpy(retval, buffer, length);
|
||||
}
|
||||
validReturn = YES;
|
||||
}
|
||||
|
||||
- (void) setSelector: (SEL)aSelector
|
||||
{
|
||||
selector = aSelector;
|
||||
selector = aSelector;
|
||||
}
|
||||
|
||||
- (void) setTarget: (id)anObject
|
||||
{
|
||||
if (argsRetained) {
|
||||
[anObject retain];
|
||||
[target release];
|
||||
if (argsRetained)
|
||||
{
|
||||
[anObject retain];
|
||||
[target release];
|
||||
}
|
||||
target = anObject;
|
||||
target = anObject;
|
||||
}
|
||||
|
||||
- (id) target
|
||||
{
|
||||
return target;
|
||||
return target;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -209,41 +242,50 @@
|
|||
|
||||
- (BOOL) argumentsRetained
|
||||
{
|
||||
return argsRetained;
|
||||
return argsRetained;
|
||||
}
|
||||
|
||||
- (void)retainArguments
|
||||
{
|
||||
if (argsRetained) {
|
||||
return;
|
||||
if (argsRetained)
|
||||
{
|
||||
return;
|
||||
}
|
||||
else {
|
||||
int i;
|
||||
else
|
||||
{
|
||||
int i;
|
||||
|
||||
argsRetained = YES;
|
||||
[target retain];
|
||||
if (argframe == 0) {
|
||||
return;
|
||||
argsRetained = YES;
|
||||
[target retain];
|
||||
if (argframe == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
for (i = 3; i <= numArgs; i++) {
|
||||
if (*info[i].type == _C_ID || *info[i].type == _C_CHARPTR) {
|
||||
if (*info[i].type == _C_ID) {
|
||||
id old;
|
||||
for (i = 3; i <= numArgs; i++)
|
||||
{
|
||||
if (*info[i].type == _C_ID || *info[i].type == _C_CHARPTR)
|
||||
{
|
||||
if (*info[i].type == _C_ID)
|
||||
{
|
||||
id old;
|
||||
|
||||
mframe_get_arg(argframe, &info[i], &old);
|
||||
if (old != nil) {
|
||||
[old retain];
|
||||
mframe_get_arg(argframe, &info[i], &old);
|
||||
if (old != nil)
|
||||
{
|
||||
[old retain];
|
||||
}
|
||||
}
|
||||
else {
|
||||
char *str;
|
||||
else
|
||||
{
|
||||
char *str;
|
||||
|
||||
mframe_get_arg(argframe, &info[i], &str);
|
||||
if (str != 0) {
|
||||
char *tmp = objc_malloc(strlen(str)+1);
|
||||
mframe_get_arg(argframe, &info[i], &str);
|
||||
if (str != 0)
|
||||
{
|
||||
char *tmp = objc_malloc(strlen(str)+1);
|
||||
|
||||
strcpy(tmp, str);
|
||||
mframe_set_arg(argframe, &info[i], &tmp);
|
||||
strcpy(tmp, str);
|
||||
mframe_set_arg(argframe, &info[i], &tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -257,57 +299,60 @@
|
|||
|
||||
- (void) invoke
|
||||
{
|
||||
[self invokeWithTarget: target];
|
||||
[self invokeWithTarget: target];
|
||||
}
|
||||
|
||||
- (void) invokeWithTarget:(id)anObject
|
||||
{
|
||||
id old_target;
|
||||
retval_t returned;
|
||||
IMP imp;
|
||||
int stack_argsize;
|
||||
id old_target;
|
||||
retval_t returned;
|
||||
IMP imp;
|
||||
int stack_argsize;
|
||||
|
||||
/*
|
||||
* A message to a nil object returns nil.
|
||||
*/
|
||||
if (anObject == nil) {
|
||||
memset(retval, '\0', info[0].size); /* Clear return value */
|
||||
return;
|
||||
/*
|
||||
* A message to a nil object returns nil.
|
||||
*/
|
||||
if (anObject == nil)
|
||||
{
|
||||
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
|
||||
* argframe.
|
||||
*/
|
||||
old_target = [target retain];
|
||||
[self setTarget: anObject];
|
||||
/*
|
||||
* Temporarily set new target and copy it (and the selector) into the
|
||||
* argframe.
|
||||
*/
|
||||
old_target = [target retain];
|
||||
[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(
|
||||
((struct objc_class*)target)->class_pointer, selector)
|
||||
: class_get_class_method(
|
||||
((struct objc_class*)target)->class_pointer, selector));
|
||||
/*
|
||||
* If fast lookup failed, we may be forwarding or something ...
|
||||
*/
|
||||
if (imp == 0)
|
||||
imp = objc_msg_lookup(target, selector);
|
||||
/*
|
||||
* If fast lookup failed, we may be forwarding or something ...
|
||||
*/
|
||||
if (imp == 0)
|
||||
imp = objc_msg_lookup(target, selector);
|
||||
|
||||
[self setTarget: old_target];
|
||||
[old_target release];
|
||||
[self setTarget: old_target];
|
||||
[old_target release];
|
||||
|
||||
stack_argsize = [sig frameLength];
|
||||
stack_argsize = [sig frameLength];
|
||||
|
||||
returned = __builtin_apply((void(*)(void))imp, argframe, stack_argsize);
|
||||
if (info[0].size) {
|
||||
mframe_decode_return(info[0].type, retval, returned);
|
||||
returned = __builtin_apply((void(*)(void))imp, argframe, stack_argsize);
|
||||
if (info[0].size)
|
||||
{
|
||||
mframe_decode_return(info[0].type, retval, returned);
|
||||
}
|
||||
validReturn = YES;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -316,74 +361,96 @@
|
|||
|
||||
- (NSMethodSignature*) methodSignature
|
||||
{
|
||||
return sig;
|
||||
return sig;
|
||||
}
|
||||
|
||||
- (NSString*)description
|
||||
{
|
||||
/* Don't use -[NSString stringWithFormat:] method because it can cause
|
||||
infinite recursion. */
|
||||
char buffer[1024];
|
||||
/*
|
||||
* Don't use -[NSString stringWithFormat:] method because it can cause
|
||||
* 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), \
|
||||
self, \
|
||||
selector ? [NSStringFromSelector(selector) cString] : "nil", \
|
||||
target ? [NSStringFromClass([target class]) cString] : "nil" \
|
||||
);
|
||||
|
||||
return [NSString stringWithCString:buffer];
|
||||
return [NSString stringWithCString:buffer];
|
||||
}
|
||||
|
||||
- (void) encodeWithCoder: (NSCoder*)aCoder
|
||||
{
|
||||
const char *types = [sig methodType];
|
||||
int i;
|
||||
const char *types = [sig methodType];
|
||||
int i;
|
||||
|
||||
[aCoder encodeValueOfObjCType: @encode(char*)
|
||||
at: &types
|
||||
withName: @"invocation types"];
|
||||
[aCoder encodeValueOfObjCType: @encode(char*)
|
||||
at: &types];
|
||||
|
||||
[aCoder encodeBycopyObject: target
|
||||
withName: @"target"];
|
||||
[aCoder encodeObject: target];
|
||||
|
||||
[aCoder encodeValueOfObjCType: info[2].type
|
||||
at: &selector
|
||||
withName: @"selector"];
|
||||
[aCoder encodeValueOfObjCType: info[2].type
|
||||
at: &selector];
|
||||
|
||||
for (i = 3; i <= numArgs; i++) {
|
||||
const char *type = info[i].type;
|
||||
void *datum;
|
||||
for (i = 3; i <= numArgs; i++)
|
||||
{
|
||||
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)
|
||||
[aCoder encodeBycopyObject: *(id*)datum withName: @"arg"];
|
||||
else
|
||||
[aCoder encodeValueOfObjCType: type at: datum withName: @"arg"];
|
||||
if (*type == _C_ID)
|
||||
{
|
||||
[aCoder encodeObject: *(id*)datum];
|
||||
}
|
||||
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
|
||||
{
|
||||
NSMethodSignature *newSig;
|
||||
const char *types;
|
||||
void *datum;
|
||||
int i;
|
||||
NSMethodSignature *newSig;
|
||||
const char *types;
|
||||
void *datum;
|
||||
int i;
|
||||
|
||||
[aCoder decodeValueOfObjCType: @encode(char*) at: &types];
|
||||
newSig = [NSMethodSignature signatureWithObjCTypes: types];
|
||||
self = [self initWithMethodSignature: newSig];
|
||||
[aCoder decodeValueOfObjCType: @encode(char*) at: &types];
|
||||
newSig = [NSMethodSignature signatureWithObjCTypes: types];
|
||||
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++) {
|
||||
datum = mframe_arg_addr(argframe, &info[i]);
|
||||
[aCoder decodeValueOfObjCType: info[i].type at: datum];
|
||||
for (i = 3; i <= numArgs; i++)
|
||||
{
|
||||
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
|
||||
{
|
||||
const char *types;
|
||||
NSMethodSignature *newSig;
|
||||
const char *types;
|
||||
NSMethodSignature *newSig;
|
||||
|
||||
types = sel_get_type(aSelector);
|
||||
if (types == 0) {
|
||||
types = sel_get_type(sel_get_any_typed_uid(sel_get_name(aSelector)));
|
||||
types = sel_get_type(aSelector);
|
||||
if (types == 0)
|
||||
{
|
||||
types = sel_get_type(sel_get_any_typed_uid(sel_get_name(aSelector)));
|
||||
}
|
||||
if (types == 0) {
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"Couldn't find encoding type for selector %s.",
|
||||
if (types == 0)
|
||||
{
|
||||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"Couldn't find encoding type for selector %s.",
|
||||
sel_get_name(aSelector)];
|
||||
}
|
||||
newSig = [NSMethodSignature signatureWithObjCTypes: types];
|
||||
self = [self initWithMethodSignature: newSig];
|
||||
if (self) {
|
||||
[self setSelector: aSelector];
|
||||
/*
|
||||
* Copy the argframe we were given.
|
||||
*/
|
||||
if (frame) {
|
||||
int i;
|
||||
newSig = [NSMethodSignature signatureWithObjCTypes: types];
|
||||
self = [self initWithMethodSignature: newSig];
|
||||
if (self)
|
||||
{
|
||||
[self setSelector: aSelector];
|
||||
/*
|
||||
* Copy the argframe we were given.
|
||||
*/
|
||||
if (frame)
|
||||
{
|
||||
int i;
|
||||
|
||||
mframe_get_arg(frame, &info[1], &target);
|
||||
for (i = 1; i <= numArgs; i++) {
|
||||
mframe_cpy_arg(argframe, frame, &info[i]);
|
||||
mframe_get_arg(frame, &info[1], &target);
|
||||
for (i = 1; i <= numArgs; i++)
|
||||
{
|
||||
mframe_cpy_arg(argframe, frame, &info[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return self;
|
||||
return self;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -430,84 +502,92 @@
|
|||
*/
|
||||
- initWithMethodSignature: (NSMethodSignature*)aSignature
|
||||
{
|
||||
sig = [aSignature retain];
|
||||
numArgs = [aSignature numberOfArguments];
|
||||
info = [aSignature methodInfo];
|
||||
argframe = mframe_create_argframe([sig methodType], &retval);
|
||||
if (retval == 0 && info[0].size > 0) {
|
||||
retval = objc_malloc(info[0].size);
|
||||
sig = [aSignature retain];
|
||||
numArgs = [aSignature numberOfArguments];
|
||||
info = [aSignature methodInfo];
|
||||
argframe = mframe_create_argframe([sig methodType], &retval);
|
||||
if (retval == 0 && info[0].size > 0)
|
||||
{
|
||||
retval = objc_malloc(info[0].size);
|
||||
}
|
||||
return self;
|
||||
return self;
|
||||
}
|
||||
|
||||
- initWithSelector: (SEL)aSelector
|
||||
{
|
||||
return [self initWithArgframe: 0 selector: aSelector];
|
||||
return [self initWithArgframe: 0 selector: aSelector];
|
||||
}
|
||||
|
||||
- initWithTarget: anObject selector: (SEL)aSelector, ...
|
||||
{
|
||||
va_list ap;
|
||||
va_list ap;
|
||||
|
||||
self = [self initWithArgframe: 0 selector: aSelector];
|
||||
if (self) {
|
||||
int i;
|
||||
self = [self initWithArgframe: 0 selector: aSelector];
|
||||
if (self)
|
||||
{
|
||||
int i;
|
||||
|
||||
[self setTarget: anObject];
|
||||
va_start (ap, aSelector);
|
||||
for (i = 3; i <= numArgs; i++) {
|
||||
const char *type = info[i].type;
|
||||
unsigned size = info[i].size;
|
||||
void *datum;
|
||||
[self setTarget: anObject];
|
||||
va_start (ap, aSelector);
|
||||
for (i = 3; i <= numArgs; i++)
|
||||
{
|
||||
const char *type = info[i].type;
|
||||
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
|
||||
switch (*type) {
|
||||
case _C_ID:
|
||||
*(id*)datum = va_arg (ap, id);
|
||||
if (argsRetained)
|
||||
[*(id*)datum retain];
|
||||
break;
|
||||
case _C_CHARPTR:
|
||||
*(char**)datum = va_arg (ap, char*);
|
||||
if (argsRetained) {
|
||||
char *old = *(char**)datum;
|
||||
switch (*type)
|
||||
{
|
||||
case _C_ID:
|
||||
*(id*)datum = va_arg (ap, id);
|
||||
if (argsRetained)
|
||||
{
|
||||
[*(id*)datum retain];
|
||||
}
|
||||
break;
|
||||
case _C_CHARPTR:
|
||||
*(char**)datum = va_arg (ap, char*);
|
||||
if (argsRetained)
|
||||
{
|
||||
char *old = *(char**)datum;
|
||||
|
||||
if (old != 0) {
|
||||
char *tmp = objc_malloc(strlen(old)+1);
|
||||
if (old != 0)
|
||||
{
|
||||
char *tmp = objc_malloc(strlen(old)+1);
|
||||
|
||||
strcpy(tmp, old);
|
||||
*(char**)datum = tmp;
|
||||
}
|
||||
}
|
||||
break;
|
||||
CASE_TYPE(_C_CLASS, Class);
|
||||
CASE_TYPE(_C_SEL, SEL);
|
||||
CASE_TYPE(_C_LNG, long);
|
||||
CASE_TYPE(_C_ULNG, unsigned long);
|
||||
CASE_TYPE(_C_INT, int);
|
||||
CASE_TYPE(_C_UINT, unsigned int);
|
||||
CASE_TYPE(_C_SHT, short);
|
||||
CASE_TYPE(_C_USHT, unsigned short);
|
||||
CASE_TYPE(_C_CHR, char);
|
||||
CASE_TYPE(_C_UCHR, unsigned char);
|
||||
CASE_TYPE(_C_FLT, float);
|
||||
CASE_TYPE(_C_DBL, double);
|
||||
CASE_TYPE(_C_PTR, void*);
|
||||
default:
|
||||
strcpy(tmp, old);
|
||||
*(char**)datum = tmp;
|
||||
}
|
||||
}
|
||||
break;
|
||||
CASE_TYPE(_C_CLASS, Class);
|
||||
CASE_TYPE(_C_SEL, SEL);
|
||||
CASE_TYPE(_C_LNG, long);
|
||||
CASE_TYPE(_C_ULNG, unsigned long);
|
||||
CASE_TYPE(_C_INT, int);
|
||||
CASE_TYPE(_C_UINT, unsigned int);
|
||||
CASE_TYPE(_C_SHT, short);
|
||||
CASE_TYPE(_C_USHT, unsigned short);
|
||||
CASE_TYPE(_C_CHR, char);
|
||||
CASE_TYPE(_C_UCHR, unsigned char);
|
||||
CASE_TYPE(_C_FLT, float);
|
||||
CASE_TYPE(_C_DBL, double);
|
||||
CASE_TYPE(_C_PTR, void*);
|
||||
default:
|
||||
{
|
||||
memcpy(datum, va_arg(ap, typeof(char[size])), size);
|
||||
memcpy(datum, va_arg(ap, typeof(char[size])), size);
|
||||
} /* default */
|
||||
}
|
||||
}
|
||||
}
|
||||
return self;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void*) returnFrame: (arglist_t)argFrame
|
||||
{
|
||||
return mframe_handle_return(info[0].type, retval, argFrame);
|
||||
return mframe_handle_return(info[0].type, retval, argFrame);
|
||||
}
|
||||
@end
|
||||
|
||||
|
|
@ -515,7 +595,7 @@
|
|||
|
||||
- (void) invokeWithObject: (id)obj
|
||||
{
|
||||
[self invokeWithTarget: (id)obj];
|
||||
[self invokeWithTarget: (id)obj];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -283,7 +283,8 @@ static IMP rDatImp; /* To autorelease it. */
|
|||
}
|
||||
NS_HANDLER
|
||||
{
|
||||
obj = nil;
|
||||
[unarchiver release];
|
||||
[localException raise];
|
||||
}
|
||||
NS_ENDHANDLER
|
||||
[unarchiver release];
|
||||
|
|
@ -639,10 +640,7 @@ static IMP rDatImp; /* To autorelease it. */
|
|||
int offset = 0;
|
||||
|
||||
typeCheck(*type, _C_STRUCT_B);
|
||||
while (*type != _C_STRUCT_E && *type != '=')
|
||||
{
|
||||
type++;
|
||||
}
|
||||
while (*type != _C_STRUCT_E && *type++ != '='); /* skip "<name>=" */
|
||||
for (;;)
|
||||
{
|
||||
(*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);
|
||||
*(void**)address = NSZoneMalloc(zone, size);
|
||||
arrayAddItem(ptrMap, *(void**)address);
|
||||
|
||||
/*
|
||||
* Decode value and add memory to map for crossrefs.
|
||||
*/
|
||||
(*dValImp)(self, dValSel, type, *(void**)address);
|
||||
arrayAddItem(ptrMap, *(void**)address);
|
||||
|
||||
/*
|
||||
* Allocate, initialise, and autorelease an NSData
|
||||
|
|
|
|||
Loading…
Reference in a new issue