gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

DO fixes for ffcall library

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8403 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-12-21 20:54:02 +00:00
parent 0b5ec72bf8
commit 3a23768e5d
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2000-12-21 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSDistantObject.m: Modified DO_FORWARD_INVOCATION() macro
and its uses so that they actually do what was intended :-)
Also, modified implementation of methodSignatureForSelector: for
ffcall library to prevent recursion.
2000-12-21 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/GSIMap.h: On initialisation set number of nodes

31
Source/NSDistantObject.m
View file

@ -30,13 +30,14 @@
#include <Foundation/NSMethodSignature.h>
#include <Foundation/NSException.h>
#include <Foundation/NSObjCRuntime.h>
#include <Foundation/NSInvocation.h>
#define DO_FORWARD_INVOCATION(_SELX, _ARG1) \
sig = [self methodSignatureForSelector: @selector(_SELX)]; \
inv = [NSInvocation invocationWithMethodSignature: sig]; \
[inv setSelector: @selector(_SELX)]; \
[inv setTarget: self]; \
[inv setArgument: _ARG1 atIndex: 2]; \
[inv setArgument: (void*)&_ARG1 atIndex: 2]; \
[self forwardInvocation: inv]; \
[inv getReturnValue: &m]
@ -798,8 +799,28 @@ enum
id m;
const char *types;
#ifdef USE_FFCALL
id inv, sig;
DO_FORWARD_INVOCATION(_cmd, aSelector);
/*
* Evil hack to prevent recursion - if we are asking a remote
* object for a method signature, we can't ask it for the
* signature of methodSignatureForSelector:, so we hack in
* the signature required manually :-(
*/
if (sel_eq(aSelector, _cmd))
{
static NSMethodSignature *sig = nil;
if (sig == nil)
{
sig = [NSMethodSignature signatureWithObjCTypes: "@@::"];
RETAIN(sig);
}
return sig;
}
else
{
id inv, sig;
DO_FORWARD_INVOCATION(methodSignatureForSelector:, aSelector);
}
#else
arglist_t args;
void *retframe;
@ -928,7 +949,7 @@ static inline BOOL class_is_kind_of (Class self, Class aClassObject)
#ifdef USE_FFCALL
BOOL m;
id inv, sig;
DO_FORWARD_INVOCATION(_cmd, aProtocol);
DO_FORWARD_INVOCATION(conformsToProtocol:, aProtocol);
return m;
#else
arglist_t args;
@ -953,7 +974,7 @@ static inline BOOL class_is_kind_of (Class self, Class aClassObject)
#ifdef USE_FFCALL
BOOL m;
id inv, sig;
DO_FORWARD_INVOCATION(_cmd, aSelector);
DO_FORWARD_INVOCATION(respondsToSelector:, aSelector);
return m;
#else
arglist_t args;