[gi-invoke-ng] refactor FunctionCache to be more generic CallableCache

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
 

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);

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);

gi/pygi.h

@@ -44,7 +44,7 @@ typedef struct {
     GIBaseInfo *info;
     PyObject *inst_weakreflist;
 #ifdef ENABLE_INVOKE_NG
-    PyGIFunctionCache *cache;
+    PyGICallableCache *cache;
 #endif
 } PyGIBaseInfo;