[pygobject/invoke-rewrite] [gi-invoke-ng] refactor FunctionCache to be more generic CallableCache
- From: John Palmieri <johnp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject/invoke-rewrite] [gi-invoke-ng] refactor FunctionCache to be more generic CallableCache
- Date: Mon, 28 Mar 2011 22:32:31 +0000 (UTC)
commit 726a27c0e74ace3ff23d9cc4d393ae53e57f1fac
Author: John (J5) Palmieri <johnp redhat com>
Date: Mon Mar 28 18:26:09 2011 -0400
[gi-invoke-ng] refactor FunctionCache to be more generic CallableCache
gi/pygi-cache.c | 392 ++++++++++++++++++++++++++-------------------------
gi/pygi-cache.h | 12 +-
gi/pygi-info.c | 2 +-
gi/pygi-invoke-ng.c | 40 +++---
gi/pygi-marshal.c | 140 +++++++++---------
gi/pygi-marshal.h | 159 ++++++++-------------
gi/pygi.h | 2 +-
7 files changed, 362 insertions(+), 385 deletions(-)
---
diff --git a/gi/pygi-cache.c b/gi/pygi-cache.c
index ed3bc70..4bb2f4d 100644
--- a/gi/pygi-cache.c
+++ b/gi/pygi-cache.c
@@ -26,7 +26,7 @@
#include <girepository.h>
PyGIArgCache * _arg_cache_new_from_type_info (GITypeInfo *type_info,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
GIArgInfo *arg_info,
GITypeTag type_tag,
GITransfer transfer,
@@ -93,7 +93,7 @@ _callback_cache_free_func(PyGICallbackCache *cache)
}
void
-_pygi_function_cache_free(PyGIFunctionCache *cache)
+_pygi_callable_cache_free(PyGICallableCache *cache)
{
int i;
@@ -109,28 +109,35 @@ _pygi_function_cache_free(PyGIFunctionCache *cache)
_pygi_arg_cache_free(cache->return_cache);
g_slice_free1(cache->n_args * sizeof(PyGIArgCache *), cache->args_cache);
- g_slice_free(PyGIFunctionCache, cache);
+ g_slice_free(PyGICallableCache, cache);
}
/* cache generation */
-static inline PyGIFunctionCache *
-_function_cache_new_from_function_info(GIFunctionInfo *function_info)
+static inline PyGICallableCache *
+_callable_cache_new_from_callable_info(GICallableInfo *callable_info)
{
- PyGIFunctionCache *fc;
- GIFunctionInfoFlags flags;
+ PyGICallableCache *cache;
- fc = g_slice_new0(PyGIFunctionCache);
+ cache = g_slice_new0 (PyGICallableCache);
- fc->name = g_base_info_get_name((GIBaseInfo *)function_info);
- flags = g_function_info_get_flags(function_info);
- fc->is_method = flags & GI_FUNCTION_IS_METHOD;
- fc->is_constructor = flags & GI_FUNCTION_IS_CONSTRUCTOR;
+ cache->name = g_base_info_get_name ((GIBaseInfo *)callable_info);
- fc->n_args = g_callable_info_get_n_args ( (GICallableInfo *) function_info) + (fc->is_method ? 1: 0);
- if (fc->n_args > 0)
- fc->args_cache = g_slice_alloc0(fc->n_args * sizeof(PyGIArgCache *));
+ if (g_base_info_get_type ( (GIBaseInfo *)callable_info) == GI_INFO_TYPE_FUNCTION) {
+ GIFunctionInfoFlags flags;
- return fc;
+ flags = g_function_info_get_flags ( (GIFunctionInfo *)callable_info);
+ cache->is_method = flags & GI_FUNCTION_IS_METHOD;
+ cache->is_constructor = flags & GI_FUNCTION_IS_CONSTRUCTOR;
+ } else {
+ cache->is_method = TRUE;
+ cache->is_constructor = FALSE;
+ }
+
+ cache->n_args = g_callable_info_get_n_args (callable_info) + (cache->is_method ? 1: 0);
+ if (cache->n_args > 0)
+ cache->args_cache = g_slice_alloc0 (cache->n_args * sizeof(PyGIArgCache *));
+
+ return cache;
}
static inline PyGIInterfaceCache *
@@ -478,21 +485,21 @@ _arg_cache_out_filename_setup(PyGIArgCache *arg_cache,
}
static inline gboolean
-_arg_cache_in_array_setup(PyGIArgCache *arg_cache,
- PyGIFunctionCache *function_cache,
- GITypeInfo *type_info,
- GITransfer transfer,
- GIDirection direction)
+_arg_cache_in_array_setup (PyGIArgCache *arg_cache,
+ PyGICallableCache *callable_cache,
+ GITypeInfo *type_info,
+ GITransfer transfer,
+ GIDirection direction)
{
PyGISequenceCache *seq_cache = (PyGISequenceCache *)arg_cache;
- seq_cache->array_type = g_type_info_get_array_type(type_info);
+ seq_cache->array_type = g_type_info_get_array_type (type_info);
arg_cache->in_marshaller = _pygi_marshal_in_array;
-
+
if (seq_cache->len_arg_index >= 0 &&
direction == GI_DIRECTION_IN) {
PyGIArgCache *aux_cache =
- function_cache->args_cache[seq_cache->len_arg_index];
+ callable_cache->args_cache[seq_cache->len_arg_index];
if (aux_cache == NULL) {
aux_cache = _arg_cache_new();
@@ -505,36 +512,38 @@ _arg_cache_in_array_setup(PyGIArgCache *arg_cache,
aux_cache->in_marshaller = NULL;
aux_cache->out_marshaller = NULL;
- function_cache->args_cache[seq_cache->len_arg_index] = aux_cache;
+ callable_cache->args_cache[seq_cache->len_arg_index] = aux_cache;
}
/* arg_cache->cleanup = _pygi_cleanup_array; */
+
+ return TRUE;
}
static inline gboolean
-_arg_cache_out_array_setup(PyGIArgCache *arg_cache,
- PyGIFunctionCache *function_cache,
- GITypeInfo *type_info,
- GITransfer transfer,
- GIDirection direction,
- gssize arg_index)
+_arg_cache_out_array_setup (PyGIArgCache *arg_cache,
+ PyGICallableCache *callable_cache,
+ GITypeInfo *type_info,
+ GITransfer transfer,
+ GIDirection direction,
+ gssize arg_index)
{
PyGISequenceCache *seq_cache = (PyGISequenceCache *)arg_cache;
arg_cache->out_marshaller = _pygi_marshal_out_array;
- seq_cache->array_type = g_type_info_get_array_type(type_info);
+ seq_cache->array_type = g_type_info_get_array_type (type_info);
if (seq_cache->len_arg_index >= 0) {
- PyGIArgCache *aux_cache = function_cache->args_cache[seq_cache->len_arg_index];
+ PyGIArgCache *aux_cache = callable_cache->args_cache[seq_cache->len_arg_index];
if (seq_cache->len_arg_index < arg_index)
- function_cache->n_out_aux_args++;
+ callable_cache->n_out_aux_args++;
if (aux_cache != NULL) {
if (aux_cache->aux_type == PYGI_AUX_TYPE_IGNORE)
return TRUE;
- function_cache->out_args =
- g_slist_remove(function_cache->out_args, aux_cache);
+ callable_cache->out_args =
+ g_slist_remove (callable_cache->out_args, aux_cache);
} else {
aux_cache = _arg_cache_new();
}
@@ -544,7 +553,7 @@ _arg_cache_out_array_setup(PyGIArgCache *arg_cache,
aux_cache->in_marshaller = NULL;
aux_cache->out_marshaller = NULL;
- function_cache->args_cache[seq_cache->len_arg_index] = aux_cache;
+ callable_cache->args_cache[seq_cache->len_arg_index] = aux_cache;
}
return TRUE;
@@ -552,86 +561,86 @@ _arg_cache_out_array_setup(PyGIArgCache *arg_cache,
}
static inline void
-_arg_cache_in_glist_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_in_glist_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->in_marshaller = _pygi_marshal_in_glist;
/* arg_cache->cleanup = */
}
static inline void
-_arg_cache_out_glist_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_out_glist_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->out_marshaller = _pygi_marshal_out_glist;
/* arg_cache->cleanup = */
}
static inline void
-_arg_cache_in_gslist_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_in_gslist_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->in_marshaller = _pygi_marshal_in_gslist;
/* arg_cache->cleanup = */
}
static inline void
-_arg_cache_out_gslist_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_out_gslist_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->out_marshaller = _pygi_marshal_out_gslist;
/* arg_cache->cleanup = */
}
static inline void
-_arg_cache_in_ghash_setup(PyGIArgCache *arg_cache)
+_arg_cache_in_ghash_setup (PyGIArgCache *arg_cache)
{
arg_cache->in_marshaller = _pygi_marshal_in_ghash;
}
static inline void
-_arg_cache_out_ghash_setup(PyGIArgCache *arg_cache)
+_arg_cache_out_ghash_setup (PyGIArgCache *arg_cache)
{
arg_cache->out_marshaller = _pygi_marshal_out_ghash;
}
static inline void
-_arg_cache_in_gerror_setup(PyGIArgCache *arg_cache)
+_arg_cache_in_gerror_setup (PyGIArgCache *arg_cache)
{
arg_cache->in_marshaller = _pygi_marshal_in_gerror;
arg_cache->aux_type = PYGI_AUX_TYPE_IGNORE;
}
static inline void
-_arg_cache_out_gerror_setup(PyGIArgCache *arg_cache)
+_arg_cache_out_gerror_setup (PyGIArgCache *arg_cache)
{
arg_cache->out_marshaller = _pygi_marshal_out_gerror;
arg_cache->aux_type = PYGI_AUX_TYPE_IGNORE;
}
static inline void
-_arg_cache_in_interface_union_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_in_interface_union_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->in_marshaller = _pygi_marshal_in_interface_struct;
}
static inline void
-_arg_cache_out_interface_union_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_out_interface_union_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->out_marshaller = _pygi_marshal_out_interface_struct;
}
static void
-_g_slice_free_gvalue_func(GValue *value) {
+_g_slice_free_gvalue_func (GValue *value) {
g_slice_free(GValue, value);
}
static inline void
-_arg_cache_in_interface_struct_setup(PyGIArgCache *arg_cache,
- GIInterfaceInfo *iface_info,
- GITransfer transfer)
+_arg_cache_in_interface_struct_setup (PyGIArgCache *arg_cache,
+ GIInterfaceInfo *iface_info,
+ GITransfer transfer)
{
PyGIInterfaceCache *iface_cache = (PyGIInterfaceCache *)arg_cache;
iface_cache->is_foreign = g_struct_info_is_foreign( (GIStructInfo*)iface_info);
@@ -643,9 +652,9 @@ _arg_cache_in_interface_struct_setup(PyGIArgCache *arg_cache,
}
static inline void
-_arg_cache_out_interface_struct_setup(PyGIArgCache *arg_cache,
- GIInterfaceInfo *iface_info,
- GITransfer transfer)
+_arg_cache_out_interface_struct_setup (PyGIArgCache *arg_cache,
+ GIInterfaceInfo *iface_info,
+ GITransfer transfer)
{
PyGIInterfaceCache *iface_cache = (PyGIInterfaceCache *)arg_cache;
iface_cache->is_foreign = g_struct_info_is_foreign( (GIStructInfo*)iface_info);
@@ -653,8 +662,8 @@ _arg_cache_out_interface_struct_setup(PyGIArgCache *arg_cache,
}
static inline void
-_arg_cache_in_interface_object_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_in_interface_object_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->in_marshaller = _pygi_marshal_in_interface_object;
if (transfer == GI_TRANSFER_EVERYTHING)
@@ -662,69 +671,69 @@ _arg_cache_in_interface_object_setup(PyGIArgCache *arg_cache,
}
static inline void
-_arg_cache_out_interface_object_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_out_interface_object_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->out_marshaller = _pygi_marshal_out_interface_object;
}
static inline void
-_arg_cache_in_interface_callback_setup(PyGIArgCache *arg_cache,
- PyGIFunctionCache *function_cache)
+_arg_cache_in_interface_callback_setup (PyGIArgCache *arg_cache,
+ PyGICallableCache *callable_cache)
{
PyGICallbackCache *callback_cache = (PyGICallbackCache *)arg_cache;
if (callback_cache->user_data_index >= 0) {
- PyGIArgCache *user_data_arg_cache = _arg_cache_new();
+ PyGIArgCache *user_data_arg_cache = _arg_cache_new ();
user_data_arg_cache->aux_type = PYGI_AUX_TYPE_HAS_PYARG;
- function_cache->args_cache[callback_cache->user_data_index] = user_data_arg_cache;
+ callable_cache->args_cache[callback_cache->user_data_index] = user_data_arg_cache;
}
if (callback_cache->destroy_notify_index >= 0) {
- PyGIArgCache *destroy_arg_cache = _arg_cache_new();
+ PyGIArgCache *destroy_arg_cache = _arg_cache_new ();
destroy_arg_cache->aux_type = PYGI_AUX_TYPE_IGNORE;
- function_cache->args_cache[callback_cache->destroy_notify_index] = destroy_arg_cache;
+ callable_cache->args_cache[callback_cache->destroy_notify_index] = destroy_arg_cache;
}
arg_cache->in_marshaller = _pygi_marshal_in_interface_callback;
}
static inline void
-_arg_cache_out_interface_callback_setup(void)
+_arg_cache_out_interface_callback_setup (void)
{
PyErr_Format(PyExc_NotImplementedError,
"Callback returns are not supported");
}
static inline void
-_arg_cache_in_interface_enum_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_in_interface_enum_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->in_marshaller = _pygi_marshal_in_interface_enum;
}
static inline void
-_arg_cache_out_interface_enum_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_out_interface_enum_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->out_marshaller = _pygi_marshal_out_interface_enum;
}
static inline void
-_arg_cache_in_interface_flags_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_in_interface_flags_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->in_marshaller = _pygi_marshal_in_interface_flags;
}
static inline void
-_arg_cache_out_interface_flags_setup(PyGIArgCache *arg_cache,
- GITransfer transfer)
+_arg_cache_out_interface_flags_setup (PyGIArgCache *arg_cache,
+ GITransfer transfer)
{
arg_cache->out_marshaller = _pygi_marshal_out_interface_flags;
}
static inline PyGIArgCache *
_arg_cache_new_from_interface_info (GIInterfaceInfo *iface_info,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
GIArgInfo *arg_info,
GIInfoType info_type,
GITransfer transfer,
@@ -800,14 +809,14 @@ _arg_cache_new_from_interface_info (GIInterfaceInfo *iface_info,
callback_cache =
_callback_cache_new_from_arg_info(arg_info,
iface_info,
- function_cache->is_method ? 1: 0);
+ callable_cache->is_method ? 1: 0);
arg_cache = (PyGIArgCache *)callback_cache;
if (arg_cache == NULL)
return NULL;
if (direction == GI_DIRECTION_IN || direction == GI_DIRECTION_INOUT)
- _arg_cache_in_interface_callback_setup(arg_cache, function_cache);
+ _arg_cache_in_interface_callback_setup(arg_cache, callable_cache);
break;
}
@@ -849,7 +858,7 @@ _arg_cache_new_from_interface_info (GIInterfaceInfo *iface_info,
PyGIArgCache *
_arg_cache_new_from_type_info (GITypeInfo *type_info,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
GIArgInfo *arg_info,
GITypeTag type_tag,
GITransfer transfer,
@@ -1054,29 +1063,29 @@ _arg_cache_new_from_type_info (GITypeInfo *type_info,
case GI_TYPE_TAG_ARRAY:
{
PyGISequenceCache *seq_cache =
- _sequence_cache_new_from_type_info(type_info,
- direction,
- transfer,
- (function_cache->is_method ? 1: 0));
+ _sequence_cache_new_from_type_info (type_info,
+ direction,
+ transfer,
+ (callable_cache->is_method ? 1: 0));
arg_cache = (PyGIArgCache *)seq_cache;
if (arg_cache == NULL)
break;
if (direction == GI_DIRECTION_IN || direction == GI_DIRECTION_INOUT)
- _arg_cache_in_array_setup(arg_cache,
- function_cache,
- type_info,
- transfer,
- direction);
-
- if (direction == GI_DIRECTION_OUT || direction == GI_DIRECTION_INOUT)
- _arg_cache_out_array_setup(arg_cache,
- function_cache,
+ _arg_cache_in_array_setup (arg_cache,
+ callable_cache,
type_info,
transfer,
- direction,
- c_arg_index);
+ direction);
+
+ if (direction == GI_DIRECTION_OUT || direction == GI_DIRECTION_INOUT)
+ _arg_cache_out_array_setup (arg_cache,
+ callable_cache,
+ type_info,
+ transfer,
+ direction,
+ c_arg_index);
/* ugly edge case code:
*
@@ -1088,12 +1097,12 @@ _arg_cache_new_from_type_info (GITypeInfo *type_info,
gssize i;
py_arg_index -= 1;
- function_cache->n_py_args -= 1;
+ callable_cache->n_py_args -= 1;
for (i = seq_cache->len_arg_index + 1;
- i < function_cache->n_args;
+ i < callable_cache->n_args;
i++) {
- PyGIArgCache *update_cache = function_cache->args_cache[i];
+ PyGIArgCache *update_cache = callable_cache->args_cache[i];
if (update_cache == NULL)
break;
@@ -1106,10 +1115,10 @@ _arg_cache_new_from_type_info (GITypeInfo *type_info,
case GI_TYPE_TAG_GLIST:
{
PyGISequenceCache *seq_cache =
- _sequence_cache_new_from_type_info(type_info,
- direction,
- transfer,
- (function_cache->is_method ? 1: 0));
+ _sequence_cache_new_from_type_info (type_info,
+ direction,
+ transfer,
+ callable_cache->is_method ? 1: 0);
arg_cache = (PyGIArgCache *)seq_cache;
if (arg_cache == NULL)
@@ -1127,10 +1136,10 @@ _arg_cache_new_from_type_info (GITypeInfo *type_info,
case GI_TYPE_TAG_GSLIST:
{
PyGISequenceCache *seq_cache =
- _sequence_cache_new_from_type_info(type_info,
- direction,
- transfer,
- (function_cache->is_method ? 1: 0));
+ _sequence_cache_new_from_type_info (type_info,
+ direction,
+ transfer,
+ callable_cache->is_method ? 1: 0);
arg_cache = (PyGIArgCache *)seq_cache;
if (arg_cache == NULL)
@@ -1165,16 +1174,16 @@ _arg_cache_new_from_type_info (GITypeInfo *type_info,
{
GIInterfaceInfo *interface_info = g_type_info_get_interface(type_info);
GIInfoType info_type = g_base_info_get_type( (GIBaseInfo *) interface_info);
- arg_cache = _arg_cache_new_from_interface_info(interface_info,
- function_cache,
- arg_info,
- info_type,
- transfer,
- direction,
- c_arg_index,
- py_arg_index);
-
- g_base_info_unref( (GIBaseInfo *) interface_info);
+ arg_cache = _arg_cache_new_from_interface_info (interface_info,
+ callable_cache,
+ arg_info,
+ info_type,
+ transfer,
+ direction,
+ c_arg_index,
+ py_arg_index);
+
+ g_base_info_unref ( (GIBaseInfo *)interface_info);
break;
}
case GI_TYPE_TAG_ERROR:
@@ -1206,8 +1215,8 @@ _arg_cache_new_from_type_info (GITypeInfo *type_info,
}
static inline gboolean
-_args_cache_generate(GIFunctionInfo *function_info,
- PyGIFunctionCache *function_cache)
+_args_cache_generate (GICallableInfo *callable_info,
+ PyGICallableCache *callable_cache)
{
int arg_index = 0;
int i;
@@ -1217,56 +1226,57 @@ _args_cache_generate(GIFunctionInfo *function_info,
PyGIArgCache *return_cache;
/* cache the return arg */
return_info =
- g_callable_info_get_return_type( (GICallableInfo *)function_info);
+ g_callable_info_get_return_type (callable_info);
return_transfer =
- g_callable_info_get_caller_owns( (GICallableInfo *)function_info);
- return_type_tag = g_type_info_get_tag(return_info);
+ g_callable_info_get_caller_owns (callable_info);
+ return_type_tag = g_type_info_get_tag (return_info);
return_cache =
- _arg_cache_new_from_type_info(return_info,
- function_cache,
- NULL,
- return_type_tag,
- return_transfer,
- GI_DIRECTION_OUT,
- -1,
- -1);
-
- function_cache->return_cache = return_cache;
- g_base_info_unref(return_info);
+ _arg_cache_new_from_type_info (return_info,
+ callable_cache,
+ NULL,
+ return_type_tag,
+ return_transfer,
+ GI_DIRECTION_OUT,
+ -1,
+ -1);
+
+ callable_cache->return_cache = return_cache;
+ g_base_info_unref (return_info);
/* first arg is the instance */
- if (function_cache->is_method) {
+ if (callable_cache->is_method) {
GIInterfaceInfo *interface_info;
PyGIArgCache *instance_cache;
GIInfoType info_type;
- interface_info = g_base_info_get_container ( (GIBaseInfo *) function_info);
- info_type = g_base_info_get_type(interface_info);
+ interface_info = g_base_info_get_container ( (GIBaseInfo *)callable_info);
+ info_type = g_base_info_get_type (interface_info);
instance_cache =
- _arg_cache_new_from_interface_info(interface_info,
- function_cache,
- NULL,
- info_type,
- GI_TRANSFER_NOTHING,
- GI_DIRECTION_IN,
- arg_index,
- 0);
+ _arg_cache_new_from_interface_info (interface_info,
+ callable_cache,
+ NULL,
+ info_type,
+ GI_TRANSFER_NOTHING,
+ GI_DIRECTION_IN,
+ arg_index,
+ 0);
- g_base_info_unref( (GIBaseInfo *) interface_info);
+
+ g_base_info_unref ( (GIBaseInfo *)interface_info);
if (instance_cache == NULL)
return FALSE;
- function_cache->args_cache[arg_index] = instance_cache;
+ callable_cache->args_cache[arg_index] = instance_cache;
arg_index++;
- function_cache->n_in_args++;
- function_cache->n_py_args++;
+ callable_cache->n_in_args++;
+ callable_cache->n_py_args++;
}
- for (i=0; arg_index < function_cache->n_args; arg_index++, i++) {
+ for (i=0; arg_index < callable_cache->n_args; arg_index++, i++) {
PyGIArgCache *arg_cache = NULL;
GIArgInfo *arg_info;
GITypeInfo *type_info;
@@ -1277,54 +1287,54 @@ _args_cache_generate(GIFunctionInfo *function_info,
gint py_arg_index = -1;
arg_info =
- g_callable_info_get_arg( (GICallableInfo *) function_info, i);
+ g_callable_info_get_arg (callable_info, i);
- direction = g_arg_info_get_direction(arg_info);
- transfer = g_arg_info_get_ownership_transfer(arg_info);
- type_info = g_arg_info_get_type(arg_info);
- type_tag = g_type_info_get_tag(type_info);
- is_caller_allocates = g_arg_info_is_caller_allocates(arg_info);
+ direction = g_arg_info_get_direction (arg_info);
+ transfer = g_arg_info_get_ownership_transfer (arg_info);
+ type_info = g_arg_info_get_type (arg_info);
+ type_tag = g_type_info_get_tag (type_info);
+ is_caller_allocates = g_arg_info_is_caller_allocates (arg_info);
/* must be an aux arg filled in by its owner
* fill in it's c_arg_index, add to the in count
* and continue
*/
- if (function_cache->args_cache[arg_index] != NULL) {
- arg_cache = function_cache->args_cache[arg_index];
+ if (callable_cache->args_cache[arg_index] != NULL) {
+ arg_cache = callable_cache->args_cache[arg_index];
if (arg_cache->aux_type == PYGI_AUX_TYPE_HAS_PYARG) {
- arg_cache->py_arg_index = function_cache->n_py_args;
- function_cache->n_py_args++;
+ arg_cache->py_arg_index = callable_cache->n_py_args;
+ callable_cache->n_py_args++;
}
if (direction == GI_DIRECTION_IN || direction == GI_DIRECTION_INOUT) {
- arg_cache->c_arg_index = function_cache->n_in_args;
- function_cache->n_in_args++;
+ arg_cache->c_arg_index = callable_cache->n_in_args;
+ callable_cache->n_in_args++;
}
if (direction == GI_DIRECTION_OUT || direction == GI_DIRECTION_INOUT) {
- function_cache->n_out_args++;
- function_cache->n_out_aux_args++;
+ callable_cache->n_out_args++;
+ callable_cache->n_out_aux_args++;
}
- g_base_info_unref( (GIBaseInfo *)arg_info);
+ g_base_info_unref ( (GIBaseInfo *)arg_info);
continue;
}
if (direction == GI_DIRECTION_IN || direction == GI_DIRECTION_INOUT) {
- py_arg_index = function_cache->n_py_args;
- function_cache->n_in_args++;
- function_cache->n_py_args++;
+ py_arg_index = callable_cache->n_py_args;
+ callable_cache->n_in_args++;
+ callable_cache->n_py_args++;
}
arg_cache =
- _arg_cache_new_from_type_info(type_info,
- function_cache,
- arg_info,
- type_tag,
- transfer,
- direction,
- arg_index,
- py_arg_index);
+ _arg_cache_new_from_type_info (type_info,
+ callable_cache,
+ arg_info,
+ type_tag,
+ transfer,
+ direction,
+ arg_index,
+ py_arg_index);
if (arg_cache == NULL)
goto arg_err;
@@ -1333,16 +1343,16 @@ _args_cache_generate(GIFunctionInfo *function_info,
arg_cache->is_caller_allocates = is_caller_allocates;
if (direction == GI_DIRECTION_OUT || direction == GI_DIRECTION_INOUT) {
- function_cache->n_out_args++;
+ callable_cache->n_out_args++;
if (arg_cache == NULL)
goto arg_err;
- function_cache->out_args =
- g_slist_append(function_cache->out_args, arg_cache);
+ callable_cache->out_args =
+ g_slist_append (callable_cache->out_args, arg_cache);
}
- function_cache->args_cache[arg_index] = arg_cache;
+ callable_cache->args_cache[arg_index] = arg_cache;
g_base_info_unref( (GIBaseInfo *)type_info);
g_base_info_unref( (GIBaseInfo *)arg_info);
@@ -1355,25 +1365,25 @@ arg_err:
return TRUE;
}
-PyGIFunctionCache *
-_pygi_function_cache_new (GIFunctionInfo *function_info)
+PyGICallableCache *
+_pygi_callable_cache_new (GICallableInfo *callable_info)
{
- PyGIFunctionCache *fc = _function_cache_new_from_function_info(function_info);
- GIInfoType type = g_base_info_get_type ( (GIBaseInfo *)function_info);
+ PyGICallableCache *cache = _callable_cache_new_from_callable_info (callable_info);
+ GIInfoType type = g_base_info_get_type ( (GIBaseInfo *)callable_info);
if (type == GI_INFO_TYPE_VFUNC)
- fc->is_vfunc = TRUE;
+ cache->is_vfunc = TRUE;
else if (type == GI_INFO_TYPE_CALLBACK)
- fc->is_callback = TRUE;
+ cache->is_callback = TRUE;
- if (fc == NULL)
+ if (cache == NULL)
return NULL;
- if (!_args_cache_generate(function_info, fc))
+ if (!_args_cache_generate (callable_info, cache))
goto err;
- return fc;
+ return cache;
err:
- _pygi_function_cache_free(fc);
+ _pygi_callable_cache_free (cache);
return NULL;
}
diff --git a/gi/pygi-cache.h b/gi/pygi-cache.h
index 4a13457..ec8df29 100644
--- a/gi/pygi-cache.h
+++ b/gi/pygi-cache.h
@@ -30,17 +30,17 @@
G_BEGIN_DECLS
-typedef struct _PyGIFunctionCache PyGIFunctionCache;
+typedef struct _PyGICallableCache PyGICallableCache;
typedef struct _PyGIArgCache PyGIArgCache;
typedef gboolean (*PyGIMarshalInFunc) (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
typedef PyObject *(*PyGIMarshalOutFunc) (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
@@ -113,7 +113,7 @@ typedef struct _PyGICallbackCache
GIInterfaceInfo *interface_info;
} PyGICallbackCache;
-struct _PyGIFunctionCache
+struct _PyGICallableCache
{
const gchar *name;
@@ -136,9 +136,9 @@ struct _PyGIFunctionCache
};
void _pygi_arg_cache_clear (PyGIArgCache *cache);
-void _pygi_function_cache_free (PyGIFunctionCache *cache);
+void _pygi_callable_cache_free (PyGICallableCache *cache);
-PyGIFunctionCache *_pygi_function_cache_new (GIFunctionInfo *function_info);
+PyGICallableCache *_pygi_function_cache_new (GICallableInfo *callable_info);
G_END_DECLS
diff --git a/gi/pygi-info.c b/gi/pygi-info.c
index d89d1b5..5632511 100644
--- a/gi/pygi-info.c
+++ b/gi/pygi-info.c
@@ -39,7 +39,7 @@ _base_info_dealloc (PyGIBaseInfo *self)
g_base_info_unref (self->info);
#ifdef ENABLE_INVOKE_NG
- _pygi_function_cache_free(self->cache);
+ _pygi_callable_cache_free(self->cache);
#endif
Py_TYPE( (PyObject *) self)->tp_free ( (PyObject *) self);
diff --git a/gi/pygi-invoke-ng.c b/gi/pygi-invoke-ng.c
index eb01a30..b31bb7d 100644
--- a/gi/pygi-invoke-ng.c
+++ b/gi/pygi-invoke-ng.c
@@ -27,9 +27,9 @@
static inline gboolean
-_invoke_function (PyGIInvokeState *state,
- PyGIFunctionCache *cache,
- GIFunctionInfo *function_info)
+_invoke_callable (PyGIInvokeState *state,
+ PyGICallableCache *cache,
+ GICallableInfo *callable_info)
{
GError *error;
gint retval;
@@ -40,16 +40,16 @@ _invoke_function (PyGIInvokeState *state,
/* FIXME: use this for now but we can streamline the calls */
if (cache->is_vfunc)
- retval = g_vfunc_info_invoke ( function_info,
- state->implementor_gtype,
- state->in_args,
- cache->n_in_args,
- state->out_args,
- cache->n_out_args,
- &state->return_arg,
- &error);
+ retval = g_vfunc_info_invoke ( callable_info,
+ state->implementor_gtype,
+ state->in_args,
+ cache->n_in_args,
+ state->out_args,
+ cache->n_out_args,
+ &state->return_arg,
+ &error);
else
- retval = g_function_info_invoke ( function_info,
+ retval = g_function_info_invoke ( callable_info,
state->in_args,
cache->n_in_args,
state->out_args,
@@ -79,8 +79,8 @@ _invoke_function (PyGIInvokeState *state,
}
static inline gboolean
-_invoke_state_init_from_function_cache (PyGIInvokeState *state,
- PyGIFunctionCache *cache,
+_invoke_state_init_from_callable_cache (PyGIInvokeState *state,
+ PyGICallableCache *cache,
PyObject *py_args,
PyObject *kwargs)
{
@@ -162,7 +162,7 @@ _invoke_state_init_from_function_cache (PyGIInvokeState *state,
}
static inline void
-_invoke_state_clear(PyGIInvokeState *state, PyGIFunctionCache *cache)
+_invoke_state_clear(PyGIInvokeState *state, PyGICallableCache *cache)
{
g_slice_free1(cache->n_args * sizeof(GIArgument *), state->args);
g_slice_free1(cache->n_in_args * sizeof(GIArgument), state->in_args);
@@ -173,7 +173,7 @@ _invoke_state_clear(PyGIInvokeState *state, PyGIFunctionCache *cache)
}
static inline gboolean
-_invoke_marshal_in_args(PyGIInvokeState *state, PyGIFunctionCache *cache)
+_invoke_marshal_in_args(PyGIInvokeState *state, PyGICallableCache *cache)
{
int i, in_count, out_count;
in_count = 0;
@@ -299,7 +299,7 @@ _invoke_marshal_in_args(PyGIInvokeState *state, PyGIFunctionCache *cache)
}
static inline PyObject *
-_invoke_marshal_out_args(PyGIInvokeState *state, PyGIFunctionCache *cache)
+_invoke_marshal_out_args(PyGIInvokeState *state, PyGICallableCache *cache)
{
PyObject *py_out = NULL;
PyObject *py_return = NULL;
@@ -375,16 +375,16 @@ _wrap_g_callable_info_invoke (PyGIBaseInfo *self,
PyObject *ret;
if (self->cache == NULL) {
- self->cache = _pygi_function_cache_new(self->info);
+ self->cache = _pygi_callable_cache_new(self->info);
if (self->cache == NULL)
return NULL;
}
- _invoke_state_init_from_function_cache(&state, self->cache, py_args, kwargs);
+ _invoke_state_init_from_callable_cache(&state, self->cache, py_args, kwargs);
if (!_invoke_marshal_in_args (&state, self->cache))
goto err;
- if (!_invoke_function(&state, self->cache, self->info))
+ if (!_invoke_callable(&state, self->cache, self->info))
goto err;
ret = _invoke_marshal_out_args (&state, self->cache);
diff --git a/gi/pygi-marshal.c b/gi/pygi-marshal.c
index d09cc01..1bb8666 100644
--- a/gi/pygi-marshal.c
+++ b/gi/pygi-marshal.c
@@ -36,7 +36,7 @@
gboolean
_pygi_marshal_in_void (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -50,7 +50,7 @@ _pygi_marshal_in_void (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_boolean (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -62,7 +62,7 @@ _pygi_marshal_in_boolean (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_int8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -98,7 +98,7 @@ _pygi_marshal_in_int8 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_uint8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -143,7 +143,7 @@ _pygi_marshal_in_uint8 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_int16 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -179,7 +179,7 @@ _pygi_marshal_in_int16 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_uint16 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -215,7 +215,7 @@ _pygi_marshal_in_uint16 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_int32 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -251,7 +251,7 @@ _pygi_marshal_in_int32 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_uint32 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -293,7 +293,7 @@ _pygi_marshal_in_uint32 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_int64 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -362,7 +362,7 @@ _pygi_marshal_in_int64 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_uint64 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -437,7 +437,7 @@ _pygi_marshal_in_uint64 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_float (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -473,7 +473,7 @@ _pygi_marshal_in_float (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_double (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -509,7 +509,7 @@ _pygi_marshal_in_double (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_unichar (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -555,7 +555,7 @@ _pygi_marshal_in_unichar (PyGIInvokeState *state,
}
gboolean
_pygi_marshal_in_gtype (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -573,7 +573,7 @@ _pygi_marshal_in_gtype (PyGIInvokeState *state,
}
gboolean
_pygi_marshal_in_utf8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -610,7 +610,7 @@ _pygi_marshal_in_utf8 (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_filename (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -652,7 +652,7 @@ _pygi_marshal_in_filename (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_array (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -712,7 +712,7 @@ _pygi_marshal_in_array (PyGIInvokeState *state,
goto err;
if (!in_marshaller(state,
- function_cache,
+ callable_cache,
sequence_cache->item_cache,
py_item,
&item))
@@ -736,7 +736,7 @@ array_success:
if (sequence_cache->len_arg_index >= 0) {
/* we have an aux arg to handle */
PyGIArgCache *aux_cache =
- function_cache->args_cache[sequence_cache->len_arg_index];
+ callable_cache->args_cache[sequence_cache->len_arg_index];
if (aux_cache->direction == GI_DIRECTION_INOUT) {
gint *len_arg = (gint *)state->in_args[aux_cache->c_arg_index].v_pointer;
@@ -762,7 +762,7 @@ array_success:
gboolean
_pygi_marshal_in_glist (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -805,7 +805,7 @@ _pygi_marshal_in_glist (PyGIInvokeState *state,
goto err;
if (!in_marshaller(state,
- function_cache,
+ callable_cache,
sequence_cache->item_cache,
py_item,
&item))
@@ -829,7 +829,7 @@ err:
gboolean
_pygi_marshal_in_gslist (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -871,7 +871,7 @@ _pygi_marshal_in_gslist (PyGIInvokeState *state,
goto err;
if (!in_marshaller(state,
- function_cache,
+ callable_cache,
sequence_cache->item_cache,
py_item,
&item))
@@ -895,7 +895,7 @@ err:
gboolean
_pygi_marshal_in_ghash (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -967,14 +967,14 @@ _pygi_marshal_in_ghash (PyGIInvokeState *state,
goto err;
if (!key_in_marshaller(state,
- function_cache,
+ callable_cache,
hash_cache->key_cache,
py_key,
&key))
goto err;
if (!value_in_marshaller(state,
- function_cache,
+ callable_cache,
hash_cache->value_cache,
py_value,
&value))
@@ -999,7 +999,7 @@ err:
gboolean
_pygi_marshal_in_gerror (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -1011,7 +1011,7 @@ _pygi_marshal_in_gerror (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_interface_callback (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -1026,7 +1026,7 @@ _pygi_marshal_in_interface_callback (PyGIInvokeState *state,
callback_cache = (PyGICallbackCache *)arg_cache;
if (callback_cache->user_data_index > 0) {
- user_data_cache = function_cache->args_cache[callback_cache->user_data_index];
+ user_data_cache = callable_cache->args_cache[callback_cache->user_data_index];
if (user_data_cache->py_arg_index < state->n_py_in_args) {
py_user_data = PyTuple_GetItem(state->py_in_args, user_data_cache->py_arg_index);
if (!py_user_data)
@@ -1060,7 +1060,7 @@ _pygi_marshal_in_interface_callback (PyGIInvokeState *state,
}
if (callback_cache->destroy_notify_index > 0)
- destroy_cache = function_cache->args_cache[callback_cache->destroy_notify_index];
+ destroy_cache = callable_cache->args_cache[callback_cache->destroy_notify_index];
callable_info = (GICallableInfo *)callback_cache->interface_info;
@@ -1080,7 +1080,7 @@ _pygi_marshal_in_interface_callback (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_interface_enum (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -1132,7 +1132,7 @@ err:
gboolean
_pygi_marshal_in_interface_flags (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -1167,7 +1167,7 @@ err:
gboolean
_pygi_marshal_in_interface_struct (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -1258,7 +1258,7 @@ _pygi_marshal_in_interface_struct (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_interface_boxed (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -1270,7 +1270,7 @@ _pygi_marshal_in_interface_boxed (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_interface_object (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -1296,7 +1296,7 @@ _pygi_marshal_in_interface_object (PyGIInvokeState *state,
gboolean
_pygi_marshal_in_interface_union (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg)
@@ -1308,7 +1308,7 @@ _pygi_marshal_in_interface_union (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_void (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1324,7 +1324,7 @@ _pygi_marshal_out_void (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_boolean (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1334,7 +1334,7 @@ _pygi_marshal_out_boolean (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_int8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1344,7 +1344,7 @@ _pygi_marshal_out_int8 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_uint8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1355,7 +1355,7 @@ _pygi_marshal_out_uint8 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_int16 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1366,7 +1366,7 @@ _pygi_marshal_out_int16 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_uint16 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1377,7 +1377,7 @@ _pygi_marshal_out_uint16 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_int32 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1388,7 +1388,7 @@ _pygi_marshal_out_int32 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_uint32 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1399,7 +1399,7 @@ _pygi_marshal_out_uint32 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_int64 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1410,7 +1410,7 @@ _pygi_marshal_out_int64 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_uint64 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1421,7 +1421,7 @@ _pygi_marshal_out_uint64 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_float (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1432,7 +1432,7 @@ _pygi_marshal_out_float (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_double (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1443,7 +1443,7 @@ _pygi_marshal_out_double (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_unichar (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1470,7 +1470,7 @@ _pygi_marshal_out_unichar (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_gtype (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1482,7 +1482,7 @@ _pygi_marshal_out_gtype (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_utf8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1499,7 +1499,7 @@ _pygi_marshal_out_utf8 (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_filename (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1528,7 +1528,7 @@ _pygi_marshal_out_filename (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_array (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1615,7 +1615,7 @@ _pygi_marshal_out_array (PyGIInvokeState *state,
}
py_item = item_out_marshaller(state,
- function_cache,
+ callable_cache,
item_arg_cache,
&item_arg);
@@ -1640,7 +1640,7 @@ _pygi_marshal_out_array (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_glist (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1670,7 +1670,7 @@ _pygi_marshal_out_glist (PyGIInvokeState *state,
item_arg.v_pointer = list_->data;
py_item = item_out_marshaller(state,
- function_cache,
+ callable_cache,
item_arg_cache,
&item_arg);
@@ -1688,7 +1688,7 @@ _pygi_marshal_out_glist (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_gslist (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1718,7 +1718,7 @@ _pygi_marshal_out_gslist (PyGIInvokeState *state,
item_arg.v_pointer = list_->data;
py_item = item_out_marshaller(state,
- function_cache,
+ callable_cache,
item_arg_cache,
&item_arg);
@@ -1736,7 +1736,7 @@ _pygi_marshal_out_gslist (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_ghash (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1782,7 +1782,7 @@ _pygi_marshal_out_ghash (PyGIInvokeState *state,
int retval;
py_key = key_out_marshaller(state,
- function_cache,
+ callable_cache,
key_arg_cache,
&key_arg);
@@ -1792,7 +1792,7 @@ _pygi_marshal_out_ghash (PyGIInvokeState *state,
}
py_value = value_out_marshaller(state,
- function_cache,
+ callable_cache,
value_arg_cache,
&value_arg);
@@ -1818,7 +1818,7 @@ _pygi_marshal_out_ghash (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_gerror (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1831,7 +1831,7 @@ _pygi_marshal_out_gerror (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_interface_callback(PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1844,7 +1844,7 @@ _pygi_marshal_out_interface_callback(PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_interface_enum (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1861,7 +1861,7 @@ _pygi_marshal_out_interface_enum (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_interface_flags (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1874,7 +1874,7 @@ _pygi_marshal_out_interface_flags (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_interface_struct (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1913,7 +1913,7 @@ _pygi_marshal_out_interface_struct (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_interface_interface (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1926,7 +1926,7 @@ _pygi_marshal_out_interface_interface (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_interface_boxed (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1939,7 +1939,7 @@ _pygi_marshal_out_interface_boxed (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_interface_object (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
@@ -1953,7 +1953,7 @@ _pygi_marshal_out_interface_object (PyGIInvokeState *state,
PyObject *
_pygi_marshal_out_interface_union (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg)
{
diff --git a/gi/pygi-marshal.h b/gi/pygi-marshal.h
index d456747..d257134 100644
--- a/gi/pygi-marshal.h
+++ b/gi/pygi-marshal.h
@@ -30,304 +30,271 @@
G_BEGIN_DECLS
-/* Private */
-gint _pygi_g_type_interface_check_object (GIBaseInfo *info,
- PyObject *object);
-
-gint _pygi_g_type_info_check_object (GITypeInfo *type_info,
- PyObject *object,
- gboolean allow_none);
-
-gint _pygi_g_registered_type_info_check_object (GIRegisteredTypeInfo *info,
- gboolean is_instance,
- PyObject *object);
-
-
-GArray* _pygi_argument_to_array (GIArgument *arg,
- GIArgument *args[],
- GITypeInfo *type_info,
- gboolean is_method);
-
-GIArgument _pygi_argument_from_object (PyObject *object,
- GITypeInfo *type_info,
- GITransfer transfer);
-
-PyObject* _pygi_argument_to_object (GIArgument *arg,
- GITypeInfo *type_info,
- GITransfer transfer);
-
-GIArgument _pygi_argument_from_g_value(const GValue *value,
- GITypeInfo *type_info);
-
-void _pygi_argument_release (GIArgument *arg,
- GITypeInfo *type_info,
- GITransfer transfer,
- GIDirection direction);
-
-void _pygi_argument_init (void);
-
-
-/*** argument marshaling and validating routines ***/
gboolean _pygi_marshal_in_void (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_boolean (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_int8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_uint8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_int16 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_uint16 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_int32 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_uint32 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_int64 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_uint64 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_float (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_double (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_unichar (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_gtype (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_utf8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_filename (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_array (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_glist (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_gslist (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_ghash (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_gerror (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_interface_callback (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_interface_enum (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_interface_flags (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_interface_struct (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_interface_interface(PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_interface_boxed (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_interface_object (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
gboolean _pygi_marshal_in_interface_union (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
+ PyGIArgCache *arg_cache,
+ PyObject *py_arg,
+ GIArgument *arg);
+gboolean _pygi_marshal_in_interface_instance (PyGIInvokeState *state,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
PyObject *py_arg,
GIArgument *arg);
PyObject *_pygi_marshal_out_void (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_boolean (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_int8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_uint8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_int16 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_uint16 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_int32 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_uint32 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_int64 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_uint64 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_float (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_double (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_unichar (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_gtype (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_utf8 (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_filename (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_array (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_glist (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_gslist (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_ghash (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_gerror (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_interface_callback(PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_interface_enum (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_interface_flags (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_interface_struct (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_interface_interface(PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_interface_boxed (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_interface_object (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
PyObject *_pygi_marshal_out_interface_union (PyGIInvokeState *state,
- PyGIFunctionCache *function_cache,
+ PyGICallableCache *callable_cache,
PyGIArgCache *arg_cache,
GIArgument *arg);
diff --git a/gi/pygi.h b/gi/pygi.h
index c9c7d86..c23ab9b 100644
--- a/gi/pygi.h
+++ b/gi/pygi.h
@@ -44,7 +44,7 @@ typedef struct {
GIBaseInfo *info;
PyObject *inst_weakreflist;
#ifdef ENABLE_INVOKE_NG
- PyGIFunctionCache *cache;
+ PyGICallableCache *cache;
#endif
} PyGIBaseInfo;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
