luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gicallableinfo: Add two new convenience methods: is_method and can_throw_gerror

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=673805
This commit is contained in:
Jasper St. Pierre 2012-04-09 15:41:39 -03:00
parent d936489647
commit d65cec7f15
3 changed files with 74 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
gicallableinfo.c
View File

@ -81,6 +81,76 @@ signature_offset (GICallableInfo *info)
return 0;
}
/**
* g_callable_info_can_throw_gerror:
* @info: a #GICallableInfo
*
* Returns: %TRUE if this #GICallableInfo can throw a #GError
*
* Since: 1.34
*/
gboolean
g_callable_info_can_throw_gerror (GICallableInfo *info)
{
GIRealInfo *rinfo = (GIRealInfo*)info;
switch (rinfo->type) {
case GI_INFO_TYPE_FUNCTION:
{
FunctionBlob *blob;
blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
return blob->throws;
}
case GI_INFO_TYPE_VFUNC:
{
VFuncBlob *blob;
blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
return blob->throws;
}
case GI_INFO_TYPE_CALLBACK:
case GI_INFO_TYPE_SIGNAL:
return FALSE;
default:
g_assert_not_reached ();
}
}
/**
* g_callable_info_is_method:
* @info: a #GICallableInfo
*
* Determines if the callable info is a method. For #GIVFuncInfo<!-- -->s,
* #GICallbackInfo<!-- -->s, and #GISignalInfo<!-- -->s,
* this is always true. Otherwise, this looks at the %GI_FUNCTION_IS_METHOD
* flag on the #GIFunctionInfo.
*
* Concretely, this function returns whether g_callable_info_get_n_args()
* matches the number of arguments in the raw C method. For methods, there
* is one more C argument than is exposed by introspection: the "self"
* or "this" object.
*
* Since: 1.34
*/
gboolean
g_callable_info_is_method (GICallableInfo *info)
{
GIRealInfo *rinfo = (GIRealInfo*)info;
switch (rinfo->type) {
case GI_INFO_TYPE_FUNCTION:
{
FunctionBlob *blob;
blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
return (!blob->constructor && !blob->is_static);
}
case GI_INFO_TYPE_VFUNC:
case GI_INFO_TYPE_SIGNAL:
return TRUE;
case GI_INFO_TYPE_CALLBACK:
return FALSE;
default:
g_assert_not_reached ();
}
}
/**
* g_callable_info_get_return_type:
* @info: a #GICallableInfo

2
gicallableinfo.h
View File

@ -37,6 +37,8 @@ G_BEGIN_DECLS
(g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_SIGNAL) || \
(g_base_info_get_type((GIBaseInfo*)info) == GI_INFO_TYPE_VFUNC))
gboolean g_callable_info_is_method (GICallableInfo *info);
gboolean g_callable_info_can_throw_gerror (GICallableInfo *info);
GITypeInfo * g_callable_info_get_return_type (GICallableInfo *info);
void g_callable_info_load_return_type (GICallableInfo *info,
GITypeInfo *type);

29
girffi.c
View File

@ -289,33 +289,8 @@ g_function_invoker_new_for_address (gpointer addr,
invoker->native_address = addr;
info_type = g_base_info_get_type ((GIBaseInfo *) info);
switch (info_type)
{
case GI_INFO_TYPE_FUNCTION:
{
GIFunctionInfoFlags flags;
flags = g_function_info_get_flags ((GIFunctionInfo *)info);
is_method = (flags & GI_FUNCTION_IS_METHOD) != 0;
throws = (flags & GI_FUNCTION_THROWS) != 0;
}
break;
case GI_INFO_TYPE_VFUNC:
{
GIVFuncInfoFlags flags;
flags = g_vfunc_info_get_flags ((GIVFuncInfo *)info);
throws = (flags & GI_VFUNC_THROWS) != 0;
}
is_method = TRUE;
break;
case GI_INFO_TYPE_CALLBACK:
is_method = TRUE;
throws = FALSE;
break;
default:
g_assert_not_reached ();
}
is_method = g_callable_info_is_method (info);
throws = g_callable_info_can_throw_gerror (info);
tinfo = g_callable_info_get_return_type (info);
rtype = g_type_info_get_ffi_type (tinfo);