gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

DO type info fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17102 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2003-07-04 15:11:15 +00:00
parent c056845ac4
commit 33c3cfc8c8
3 changed files with 106 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2003-07-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Source/GSFFCallInvocation.m: Modify to use local type
information if it looks like it has come from a protocol ...
as too much existing code is broken in that DO server objects
which are supposed to conform to protocols in fact do not!
* Source/GSFFIInvocation.m: ditto
Fri Jul 4 11:09:37 2003 Nicola Pero <n.pero@mi.flashnet.it>
* NSTimeZones/Makefile.postamble: Make the code more robust by

53
Source/GSFFCallInvocation.m
View file

@ -715,6 +715,44 @@ GSFFCallInvokeWithTargetAndImp(NSInvocation *_inv, id anObject, IMP imp)
}
@end
/*
* Return YES if the selector contains protocol qualifiers.
*/
static BOOL
gs_protocol_selector(const char *types)
{
if (types == 0)
{
return NO;
}
while (*types != '\0')
{
if (*types == '+' || isdigit(*types))
{
types = objc_skip_offset(types);
}
while (*types == _C_CONST || *types == _C_GCINVISIBLE)
{
types++;
}
if (*types == _C_IN
|| *types == _C_INOUT
|| *types == _C_OUT
|| *types == _C_BYCOPY
|| *types == _C_BYREF
|| *types == _C_ONEWAY)
{
return YES;
}
if (*types == '\0')
{
return NO;
}
types = objc_skip_typespec(types);
}
return NO;
}
/*
* Wim Oudshoorn (6 aug 2001)
*
@ -743,7 +781,6 @@ GSInvocationCallback (void *callback_data, va_alist args)
NSMethodSignature *sig;
GSMethod fwdInvMethod;
typeinfo = (vacallReturnTypeInfo *) callback_data;
if (typeinfo->type != __VAstruct)
@ -769,7 +806,19 @@ GSInvocationCallback (void *callback_data, va_alist args)
object_get_class_name (obj), sel_get_name(selector));
}
sig = [obj methodSignatureForSelector: selector];
sig = nil;
if (gs_protocol_selector(sel_get_type(selector)) == YES)
{
/*
* We already have protocol information locally, so we don't need
* to get it from the remote system.
*/
sig = [NSMethodSignature signatureWithObjCTypes: sel_get_type(selector)];
}
if (sig == nil)
{
sig = [obj methodSignatureForSelector: selector];
}
/*
* If we got a method signature from the receiving object,

48
Source/GSFFIInvocation.m
View file

@ -353,6 +353,44 @@ GSFFIInvokeWithTargetAndImp(NSInvocation *_inv, id anObject, IMP imp)
}
@end
/*
* Return YES if the selector contains protocol qualifiers.
*/
static BOOL
gs_protocol_selector(const char *types)
{
if (types == 0)
{
return NO;
}
while (*types != '\0')
{
if (*types == '+' || isdigit(*types))
{
types = objc_skip_offset(types);
}
while (*types == _C_CONST || *types == _C_GCINVISIBLE)
{
types++;
}
if (*types == _C_IN
|| *types == _C_INOUT
|| *types == _C_OUT
|| *types == _C_BYCOPY
|| *types == _C_BYREF
|| *types == _C_ONEWAY)
{
return YES;
}
if (*types == '\0')
{
return NO;
}
types = objc_skip_typespec(types);
}
return NO;
}
void
GSFFIInvocationCallback(ffi_cif *cif, void *retp, void **args, void *user)
{
@ -375,7 +413,15 @@ GSFFIInvocationCallback(ffi_cif *cif, void *retp, void **args, void *user)
object_get_class_name (obj), sel_get_name(selector));
}
sig = [obj methodSignatureForSelector: selector];
sig = nil;
if (gs_protocol_selector(sel_get_type(selector)) == YES)
{
sig = [NSMethodSignature signatureWithObjCTypes: sel_get_type(selector)];
}
if (sig == nil)
{
sig = [obj methodSignatureForSelector: selector];
}
/*
* If we got a method signature from the receiving object,